Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason

Conflicts:
	src/mbgl/renderer/painter_prerender.cpp
	src/mbgl/renderer/prerendered_texture.cpp
	src/mbgl/renderer/prerendered_texture.hpp

1 files changed, 2 insertions, 0 deletions

diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp
index 05a766e773..21fc8f301b 100644
--- a/include/mbgl/map/map.hpp
+++ b/include/mbgl/map/map.hpp
@@ -32,6 +32,7 @@ class FileSource;
 class View;
 class GlyphAtlas;
 class SpriteAtlas;
+class LineAtlas;
 
 class Map : private util::noncopyable {
 public:
@@ -205,6 +206,7 @@ private:
     util::ptr<GlyphStore> glyphStore;
     const std::unique_ptr<SpriteAtlas> spriteAtlas;
     util::ptr<Sprite> sprite;
+    const std::unique_ptr<LineAtlas> lineAtlas;
     util::ptr<TexturePool> texturePool;
 
     const std::unique_ptr<Painter> painter;