1 files changed, 5 insertions, 11 deletions
diff --git a/intern/cycles/render/integrator.cpp b/intern/cycles/render/integrator.cpp
index cc085af20a0..3dc4b2fd4c5 100644
--- a/intern/cycles/render/integrator.cpp
+++ b/intern/cycles/render/integrator.cpp
@@ -96,7 +96,6 @@ NODE_DEFINE(Integrator)
 
 Integrator::Integrator() : Node(node_type)
 {
-  need_update = true;
 }
 
 Integrator::~Integrator()
@@ -105,7 +104,7 @@ Integrator::~Integrator()
 
 void Integrator::device_update(Device *device, DeviceScene *dscene, Scene *scene)
 {
-  if (!need_update)
+  if (!is_modified())
     return;
 
   scoped_callback_timer timer([scene](double time) {
@@ -144,7 +143,7 @@ void Integrator::device_update(Device *device, DeviceScene *dscene, Scene *scene
   kintegrator->transparent_shadows = false;
   foreach (Shader *shader, scene->shaders) {
     /* keep this in sync with SD_HAS_TRANSPARENT_SHADOW in shader.cpp */
-    if ((shader->has_surface_transparent && shader->use_transparent_shadow) ||
+    if ((shader->has_surface_transparent && shader->get_use_transparent_shadow()) ||
         shader->has_volume) {
       kintegrator->transparent_shadows = true;
       break;
@@ -227,7 +226,7 @@ void Integrator::device_update(Device *device, DeviceScene *dscene, Scene *scene
 
   if (method == BRANCHED_PATH) {
     foreach (Light *light, scene->lights)
-      max_samples = max(max_samples, light->samples);
+      max_samples = max(max_samples, light->get_samples());
 
     max_samples = max(max_samples,
                       max(diffuse_samples, max(glossy_samples, transmission_samples)));
@@ -265,7 +264,7 @@ void Integrator::device_update(Device *device, DeviceScene *dscene, Scene *scene
     dscene->sample_pattern_lut.copy_to_device();
   }
 
-  need_update = false;
+  clear_modified();
 }
 
 void Integrator::device_free(Device *, DeviceScene *dscene)
@@ -273,11 +272,6 @@ void Integrator::device_free(Device *, DeviceScene *dscene)
   dscene->sample_pattern_lut.free();
 }
 
-bool Integrator::modified(const Integrator &integrator)
-{
-  return !Node::equals(integrator);
-}
-
 void Integrator::tag_update(Scene *scene)
 {
   foreach (Shader *shader, scene->shaders) {
@@ -286,7 +280,7 @@ void Integrator::tag_update(Scene *scene)
       break;
     }
   }
-  need_update = true;
+  tag_modified();
 }
 
 CCL_NAMESPACE_END