diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-03-03 15:45:51 +0200 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-03-03 15:47:03 +0200 |
commit | 877adedb0f6dc79aa9d18706d4c8d94d0edb872d (patch) | |
tree | 556052292df8a5b071f954a4713afcc3515b7b10 /src | |
parent | bc63d7522713c941a4d924a739988de98294192c (diff) | |
download | qtlocation-mapboxgl-877adedb0f6dc79aa9d18706d4c8d94d0edb872d.tar.gz |
[core] Fix style cascade loop when transitioning
Diffstat (limited to 'src')
-rw-r--r-- | src/mbgl/map/map_context.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/style/style.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/mbgl/map/map_context.cpp b/src/mbgl/map/map_context.cpp index f9397d4f78..e6d8b389e4 100644 --- a/src/mbgl/map/map_context.cpp +++ b/src/mbgl/map/map_context.cpp @@ -247,7 +247,7 @@ bool MapContext::renderSync(const TransformState& state, const FrameData& frame) view.afterRender(); if (style->hasTransitions()) { - updateFlags |= Update::Classes; + updateFlags |= Update::Zoom; asyncUpdate.send(); } else if (painter->needsAnimation()) { updateFlags |= Update::Repaint; diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp index e5ba08e57f..fcdddb6415 100644 --- a/src/mbgl/style/style.cpp +++ b/src/mbgl/style/style.cpp @@ -176,6 +176,7 @@ void Style::recalculate(float z) { zoomHistory, data.getDefaultFadeDuration()); + hasPendingTransitions = false; for (const auto& layer : layers) { hasPendingTransitions |= layer->recalculate(parameters); |