summaryrefslogtreecommitdiff
path: root/src/mbgl/renderer/layers/render_background_layer.cpp
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2017-06-21 11:39:02 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2017-06-26 09:42:35 -0700
commit150fc6b643e0f10d2fb98d056ee4ea6a159596fb (patch)
tree2070c5fd557158437d3f565f7c4256091eca65de /src/mbgl/renderer/layers/render_background_layer.cpp
parentc3900e42d6b58eeb14c3246528f0517229bd51b9 (diff)
downloadqtlocation-mapboxgl-150fc6b643e0f10d2fb98d056ee4ea6a159596fb.tar.gz
[core] Don't transition new layers on a setStyle operation
Diffstat (limited to 'src/mbgl/renderer/layers/render_background_layer.cpp')
-rw-r--r--src/mbgl/renderer/layers/render_background_layer.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mbgl/renderer/layers/render_background_layer.cpp b/src/mbgl/renderer/layers/render_background_layer.cpp
index 83ec7bf2db..702977cd23 100644
--- a/src/mbgl/renderer/layers/render_background_layer.cpp
+++ b/src/mbgl/renderer/layers/render_background_layer.cpp
@@ -5,7 +5,8 @@
namespace mbgl {
RenderBackgroundLayer::RenderBackgroundLayer(Immutable<style::BackgroundLayer::Impl> _impl)
- : RenderLayer(style::LayerType::Background, _impl) {
+ : RenderLayer(style::LayerType::Background, _impl),
+ unevaluated(impl().paint.untransitioned()) {
}
const style::BackgroundLayer::Impl& RenderBackgroundLayer::impl() const {
@@ -19,7 +20,7 @@ std::unique_ptr<Bucket> RenderBackgroundLayer::createBucket(const BucketParamete
}
void RenderBackgroundLayer::transition(const TransitionParameters &parameters) {
- unevaluated = impl().paint.transition(parameters, std::move(unevaluated));
+ unevaluated = impl().paint.transitioned(parameters, std::move(unevaluated));
}
void RenderBackgroundLayer::evaluate(const PropertyEvaluationParameters &parameters) {