From 150fc6b643e0f10d2fb98d056ee4ea6a159596fb Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Wed, 21 Jun 2017 11:39:02 -0700
Subject: [core] Don't transition new layers on a setStyle operation

---
 src/mbgl/renderer/layers/render_fill_layer.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/mbgl/renderer/layers/render_fill_layer.cpp')

diff --git a/src/mbgl/renderer/layers/render_fill_layer.cpp b/src/mbgl/renderer/layers/render_fill_layer.cpp
index a36e1688a7..f1c7e97067 100644
--- a/src/mbgl/renderer/layers/render_fill_layer.cpp
+++ b/src/mbgl/renderer/layers/render_fill_layer.cpp
@@ -8,7 +8,8 @@
 namespace mbgl {
 
 RenderFillLayer::RenderFillLayer(Immutable<style::FillLayer::Impl> _impl)
-    : RenderLayer(style::LayerType::Fill, _impl) {
+    : RenderLayer(style::LayerType::Fill, _impl),
+      unevaluated(impl().paint.untransitioned()) {
 }
 
 const style::FillLayer::Impl& RenderFillLayer::impl() const {
@@ -20,7 +21,7 @@ std::unique_ptr<Bucket> RenderFillLayer::createBucket(const BucketParameters& pa
 }
 
 void RenderFillLayer::transition(const TransitionParameters& parameters) {
-    unevaluated = impl().paint.transition(parameters, std::move(unevaluated));
+    unevaluated = impl().paint.transitioned(parameters, std::move(unevaluated));
 }
 
 void RenderFillLayer::evaluate(const PropertyEvaluationParameters& parameters) {
-- 
cgit v1.2.1