From aae11a3430d4552adb5d43fbb3302f6efb9c6cc0 Mon Sep 17 00:00:00 2001 From: "Justin R. Miller" Date: Thu, 16 Mar 2017 16:23:15 -0700 Subject: [core] fixes #8433: don't skip style recalculations for fade-from-zero transitions (#8440) --- src/mbgl/style/style.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/mbgl/style') diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp index ac3d83b5cd..cef7f0c219 100644 --- a/src/mbgl/style/style.cpp +++ b/src/mbgl/style/style.cpp @@ -328,7 +328,7 @@ void Style::recalculate(float z, const TimePoint& timePoint, MapMode mode) { hasPendingTransitions = false; for (const auto& layer : layers) { - const bool hasTransitions = layer->baseImpl->evaluate(parameters); + hasPendingTransitions |= layer->baseImpl->evaluate(parameters); // Disable this layer if it doesn't need to be rendered. const bool needsRendering = layer->baseImpl->needsRendering(zoomHistory.lastZoom); @@ -336,8 +336,6 @@ void Style::recalculate(float z, const TimePoint& timePoint, MapMode mode) { continue; } - hasPendingTransitions |= hasTransitions; - // If this layer has a source, make sure that it gets loaded. if (Source* source = getSource(layer->baseImpl->source)) { source->baseImpl->enabled = true; -- cgit v1.2.1