[Bf-blender-cvs] [ab161d4fb53] cycles_procedural_api: cleanup, remove Film::tag_update

[Kévin Dietrich]

Commit: ab161d4fb535efe26ef19b29c015f0585c7ce7d9
Author: Kévin Dietrich
Date:   Tue Oct 6 04:55:27 2020 +0200
Branches: cycles_procedural_api
https://developer.blender.org/rBab161d4fb535efe26ef19b29c015f0585c7ce7d9

cleanup, remove Film::tag_update

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

M	intern/cycles/blender/blender_sync.cpp
M	intern/cycles/render/bake.cpp
M	intern/cycles/render/film.cpp
M	intern/cycles/render/film.h
M	intern/cycles/render/scene.cpp

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

diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp
index ee01c1589e6..12acff70662 100644
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@ -414,7 +414,7 @@ void BlenderSync::sync_film(BL::SpaceView3D &b_v3d)
 
   if (!Pass::equals(prevpasses, scene->passes)) {
     film->tag_passes_update(scene, prevpasses, false);
-    film->tag_update(scene);
+    film->tag_modified();
   }
 }
 
diff --git a/intern/cycles/render/bake.cpp b/intern/cycles/render/bake.cpp
index 14fc8ecae49..439ebdedb8e 100644
--- a/intern/cycles/render/bake.cpp
+++ b/intern/cycles/render/bake.cpp
@@ -113,7 +113,7 @@ void BakeManager::set(Scene *scene,
   }
 
   /* create device and update scene */
-  scene->film->tag_update(scene);
+  scene->film->tag_modified();
   scene->integrator->tag_update(scene);
 
   need_update = true;
diff --git a/intern/cycles/render/film.cpp b/intern/cycles/render/film.cpp
index 53e7a341618..5c3778f6ae5 100644
--- a/intern/cycles/render/film.cpp
+++ b/intern/cycles/render/film.cpp
@@ -705,11 +705,6 @@ void Film::tag_passes_update(Scene *scene, const vector<Pass> &passes_, bool upd
   }
 }
 
-void Film::tag_update(Scene * /*scene*/)
-{
-  tag_modified();
-}
-
 int Film::get_aov_offset(Scene *scene, string name, bool &is_color)
 {
   int num_color = 0, num_value = 0;
diff --git a/intern/cycles/render/film.h b/intern/cycles/render/film.h
index bfe62296e23..1f077500bfb 100644
--- a/intern/cycles/render/film.h
+++ b/intern/cycles/render/film.h
@@ -99,7 +99,6 @@ class Film : public Node {
   void device_free(Device *device, DeviceScene *dscene, Scene *scene);
 
   void tag_passes_update(Scene *scene, const vector<Pass> &passes_, bool update_passes = true);
-  void tag_update(Scene *scene);
 
   int get_aov_offset(Scene *scene, string name, bool &is_color);
 
diff --git a/intern/cycles/render/scene.cpp b/intern/cycles/render/scene.cpp
index d844efce7ea..93855ab2740 100644
--- a/intern/cycles/render/scene.cpp
+++ b/intern/cycles/render/scene.cpp
@@ -413,7 +413,7 @@ void Scene::reset()
   /* ensure all objects are updated */
   camera->tag_modified();
   dicing_camera->tag_modified();
-  film->tag_update(this);
+  film->tag_modified();
   background->tag_update(this);
   integrator->tag_update(this);
   object_manager->tag_update(this);