1 files changed, 6 insertions, 14 deletions
diff --git a/src/mbgl/renderer/render_light.cpp b/src/mbgl/renderer/render_light.cpp
index 134e1829e0..85768cff47 100644
--- a/src/mbgl/renderer/render_light.cpp
+++ b/src/mbgl/renderer/render_light.cpp
@@ -2,25 +2,17 @@
 
 namespace mbgl {
 
-RenderLight::RenderLight(std::shared_ptr<const style::Light::Impl> impl_)
-        : impl(std::move(impl_)) {
+RenderLight::RenderLight(Immutable<style::Light::Impl> impl_)
+    : impl(std::move(impl_)),
+      transitioning(impl->properties.untransitioned()) {
 }
 
-RenderLight::RenderLight(std::shared_ptr<const style::Light::Impl> impl_, const TransitioningLight transitioning_)
-        : impl(std::move(impl_))
-        , transitioning(transitioning_) {
-}
-
-std::unique_ptr<RenderLight> RenderLight::copy(std::shared_ptr<const style::Light::Impl> impl_) const {
-    return std::make_unique<RenderLight>(std::move(impl_), transitioning);
-}
-
-void RenderLight::transition(const CascadeParameters& parameters) {
-    transitioning = TransitioningLight(impl->properties, std::move(transitioning), parameters);
+void RenderLight::transition(const TransitionParameters& parameters) {
+    transitioning = impl->properties.transitioned(parameters, std::move(transitioning));
 }
 
 void RenderLight::evaluate(const PropertyEvaluationParameters& parameters) {
-    evaluated = EvaluatedLight(transitioning, parameters);
+    evaluated = transitioning.evaluate(parameters);
 }
 
 bool RenderLight::hasTransition() const {