From 877adedb0f6dc79aa9d18706d4c8d94d0edb872d Mon Sep 17 00:00:00 2001
From: Bruno de Oliveira Abinader <bruno@mapbox.com>
Date: Thu, 3 Mar 2016 15:45:51 +0200
Subject: [core] Fix style cascade loop when transitioning

---
 src/mbgl/map/map_context.cpp | 2 +-
 src/mbgl/style/style.cpp     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

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);
 
-- 
cgit v1.2.1