summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2015-09-22 16:58:38 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2015-09-28 14:10:00 -0700
commit028abaab00f2ff3a19c67366c3a9f8c803e27423 (patch)
treeedd263033a8b24326ab8e284377e319aa174bf8a /.gitignore
parentaec145ded3b9c0b4f928fb7cb1d92faac4e0e89a (diff)
downloadqtlocation-mapboxgl-028abaab00f2ff3a19c67366c3a9f8c803e27423.tar.gz
Ensure that LiveTileData can be reparsed
Annotation tiles may become partially parsed just like regular tiles, for example if a point annotation is added to the map before the style's sprite has been loaded. In such cases, they need to be reparsed or the annotation will not be rendered. Previously, the code path for reparsing would be short-circuited by a dynamic_cast<VectorTileData*> followed by a null check. This commit removes that case and adds (back) a virtual reparse method to the TileData interface.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index bd6707ba9a..4d0b4074c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,7 @@
/test/fixtures/api/1.png
/test/fixtures/api/2.png
/test/fixtures/database/*.db
+/test/output
/include/mbgl/shader/shaders.hpp
/src/shader/shaders_gl.cpp
/src/shader/shaders_gles2.cpp