[Bf-blender-cvs] [ff1a9a2e71c] cycles_procedural_api: remove Scene::update_procedurals in favor of using directly the ProceduralManager

[Kévin Dietrich]

Commit: ff1a9a2e71cc31e1b259d535118d8b2e5c99082e
Author: Kévin Dietrich
Date:   Tue Sep 29 18:41:31 2020 +0200
Branches: cycles_procedural_api
https://developer.blender.org/rBff1a9a2e71cc31e1b259d535118d8b2e5c99082e

remove Scene::update_procedurals in favor of using directly the
ProceduralManager

===================================================================

M	intern/cycles/render/scene.cpp
M	intern/cycles/render/scene.h

===================================================================

diff --git a/intern/cycles/render/scene.cpp b/intern/cycles/render/scene.cpp
index 14d64986d2b..4e8d8241431 100644
--- a/intern/cycles/render/scene.cpp
+++ b/intern/cycles/render/scene.cpp
@@ -216,7 +216,10 @@ void Scene::device_update(Device *device_, Progress &progress)
    * - Lookup tables are done a second time to handle film tables
    */
 
-  update_procedurals(progress);
+  procedural_manager->update(this, progress);
+
+  if (progress.get_cancel())
+    return;
 
   progress.set_status("Updating Shaders");
   shader_manager->device_update(device, &dscene, this, progress);
@@ -330,11 +333,6 @@ void Scene::device_update(Device *device_, Progress &progress)
   }
 }
 
-void Scene::update_procedurals(Progress &progress)
-{
-  procedural_manager->update(this, progress);
-}
-
 Scene::MotionType Scene::need_motion()
 {
   if (integrator->get_motion_blur())
@@ -476,7 +474,7 @@ bool Scene::update(Progress &progress, bool &kernel_switch_needed)
   if (need_update()) {
     /* Need to update the procedurals before tagging for used shaders as procedurals may create
      * geometry which is not in the scene yet. */
-    update_procedurals(progress);
+    procedural_manager->update(this, progress);
 
     /* Updated used shader tag so we know which features are need for the kernel. */
     shader_manager->update_shaders_used(this);
diff --git a/intern/cycles/render/scene.h b/intern/cycles/render/scene.h
index 2f7c5da5f0f..6d0fafc1205 100644
--- a/intern/cycles/render/scene.h
+++ b/intern/cycles/render/scene.h
@@ -321,8 +321,6 @@ class Scene : public NodeOwner {
     (void)owner;
   }
 
-  void update_procedurals(Progress &progress);
-
  protected:
   /* Check if some heavy data worth logging was updated.
    * Mainly used to suppress extra annoying logging.