diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-06-21 11:39:02 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-06-26 09:42:35 -0700 |
| commit | 150fc6b643e0f10d2fb98d056ee4ea6a159596fb (patch) | |
| tree | 2070c5fd557158437d3f565f7c4256091eca65de /src/mbgl/renderer/layers/render_symbol_layer.cpp | |
| parent | c3900e42d6b58eeb14c3246528f0517229bd51b9 (diff) | |
| download | qtlocation-mapboxgl-150fc6b643e0f10d2fb98d056ee4ea6a159596fb.tar.gz | |
[core] Don't transition new layers on a setStyle operation
Diffstat (limited to 'src/mbgl/renderer/layers/render_symbol_layer.cpp')
| -rw-r--r-- | src/mbgl/renderer/layers/render_symbol_layer.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mbgl/renderer/layers/render_symbol_layer.cpp b/src/mbgl/renderer/layers/render_symbol_layer.cpp index 9d59162a86..6540fc9612 100644 --- a/src/mbgl/renderer/layers/render_symbol_layer.cpp +++ b/src/mbgl/renderer/layers/render_symbol_layer.cpp @@ -9,7 +9,8 @@ namespace mbgl { RenderSymbolLayer::RenderSymbolLayer(Immutable<style::SymbolLayer::Impl> _impl) - : RenderLayer(style::LayerType::Symbol, _impl) { + : RenderLayer(style::LayerType::Symbol, _impl), + unevaluated(impl().paint.untransitioned()) { } const style::SymbolLayer::Impl& RenderSymbolLayer::impl() const { @@ -34,7 +35,7 @@ std::unique_ptr<SymbolLayout> RenderSymbolLayer::createLayout(const BucketParame } void RenderSymbolLayer::transition(const TransitionParameters& parameters) { - unevaluated = impl().paint.transition(parameters, std::move(unevaluated)); + unevaluated = impl().paint.transitioned(parameters, std::move(unevaluated)); } void RenderSymbolLayer::evaluate(const PropertyEvaluationParameters& parameters) { |