diff options
author | Justin R. Miller <incanus@codesorcery.net> | 2017-03-16 16:23:15 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-16 16:23:15 -0700 |
commit | aae11a3430d4552adb5d43fbb3302f6efb9c6cc0 (patch) | |
tree | bb7eb01bd3dbb26459933e31e91d9a06a99d9b0d | |
parent | 6fb1fb52af6467a3213fb3f46376f7f2bdfd5444 (diff) | |
download | qtlocation-mapboxgl-aae11a3430d4552adb5d43fbb3302f6efb9c6cc0.tar.gz |
[core] fixes #8433: don't skip style recalculations for fade-from-zero transitions (#8440)
-rw-r--r-- | src/mbgl/style/style.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
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; |