diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-04-26 12:42:17 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-04-26 16:29:44 -0700 |
| commit | 1c42daa152c1e7302c0997c00e206cf7c4b33d73 (patch) | |
| tree | edc0115651ed5e2931c8362016d2e7da5928f3ea /src/mbgl/annotation/annotation_manager.cpp | |
| parent | ea0e45b4019ea18c03718e67a3397202080a644a (diff) | |
| download | qtlocation-mapboxgl-1c42daa152c1e7302c0997c00e206cf7c4b33d73.tar.gz | |
[core] Tweak handling of annotation special case SpriteAtlas
* Simplify SymbolLayout; it never needs to care about more than one SpriteAtlas.
* Move the reference from SymbolLayer::Impl to SymbolBucket. This is a prerequisite for making layer Impls immutable.
Diffstat (limited to 'src/mbgl/annotation/annotation_manager.cpp')
| -rw-r--r-- | src/mbgl/annotation/annotation_manager.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/mbgl/annotation/annotation_manager.cpp b/src/mbgl/annotation/annotation_manager.cpp index 049c900b95..88153f5fb7 100644 --- a/src/mbgl/annotation/annotation_manager.cpp +++ b/src/mbgl/annotation/annotation_manager.cpp @@ -175,8 +175,6 @@ void AnnotationManager::updateStyle(Style& style) { layer->setIconAllowOverlap(true); layer->setIconIgnorePlacement(true); - layer->impl->spriteAtlas = &spriteAtlas; - style.addLayer(std::move(layer)); } |