From da4d735e2c465195e0fb9531ce9d4d7c5c9e6503 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Wed, 10 May 2017 11:34:00 -0700
Subject: [core] Unify {Paint,Layout,Light}Properties

---
 src/mbgl/renderer/render_light.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mbgl/renderer/render_light.cpp')

diff --git a/src/mbgl/renderer/render_light.cpp b/src/mbgl/renderer/render_light.cpp
index 1fc346fd26..23b7ecb9b4 100644
--- a/src/mbgl/renderer/render_light.cpp
+++ b/src/mbgl/renderer/render_light.cpp
@@ -7,11 +7,11 @@ RenderLight::RenderLight(Immutable<style::Light::Impl> impl_)
 }
 
 void RenderLight::transition(const CascadeParameters& parameters) {
-    transitioning = TransitioningLight(impl->properties, std::move(transitioning), parameters);
+    transitioning = impl->properties.cascade(parameters, std::move(transitioning));
 }
 
 void RenderLight::evaluate(const PropertyEvaluationParameters& parameters) {
-    evaluated = EvaluatedLight(transitioning, parameters);
+    evaluated = transitioning.evaluate(parameters);
 }
 
 bool RenderLight::hasTransition() const {
-- 
cgit v1.2.1