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/renderer/painter.hpp | |
| 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/renderer/painter.hpp')
| -rw-r--r-- | src/mbgl/renderer/painter.hpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mbgl/renderer/painter.hpp b/src/mbgl/renderer/painter.hpp index 47b469d971..e2777134d0 100644 --- a/src/mbgl/renderer/painter.hpp +++ b/src/mbgl/renderer/painter.hpp @@ -79,8 +79,7 @@ public: void render(const style::Style&, const FrameData&, - View&, - SpriteAtlas& annotationSpriteAtlas); + View&); void cleanup(); |