diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-22 13:28:09 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-26 11:21:56 -0700 |
| commit | aa216d00254c18f7b5903026ab1a489ae7797dd8 (patch) | |
| tree | 7decb42cb0f8a8a5ae0e9d3bdcfdf69e76949e15 /src/mbgl/annotation/annotation_tile.cpp | |
| parent | 6cf9d5cfbfe8120121d8d53cbbf8915cea8f4879 (diff) | |
| download | qtlocation-mapboxgl-aa216d00254c18f7b5903026ab1a489ae7797dd8.tar.gz | |
[core] Don't use a separate SpriteAtlas for annotation images
Instead, just add them to the Style as needed. Includes changes from #8905 and takes care to avoid regressing #3817.
Diffstat (limited to 'src/mbgl/annotation/annotation_tile.cpp')
| -rw-r--r-- | src/mbgl/annotation/annotation_tile.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mbgl/annotation/annotation_tile.cpp b/src/mbgl/annotation/annotation_tile.cpp index 1253681414..1b34026f74 100644 --- a/src/mbgl/annotation/annotation_tile.cpp +++ b/src/mbgl/annotation/annotation_tile.cpp @@ -13,7 +13,7 @@ AnnotationTile::AnnotationTile(const OverscaledTileID& overscaledTileID, const TileParameters& parameters) : GeometryTile(overscaledTileID, AnnotationManager::SourceID, parameters, *parameters.style.glyphAtlas, - parameters.annotationManager.spriteAtlas), + *parameters.style.spriteAtlas), annotationManager(parameters.annotationManager) { annotationManager.addTile(*this); } |