[Bf-blender-cvs] [734abaa252b] master: Cycles: cleanup, remove unused parameter

Kévin Dietrich noreply at git.blender.org
Mon Aug 24 16:59:29 CEST 2020


Commit: 734abaa252b40a9aae6992365379556774641269
Author: Kévin Dietrich
Date:   Mon Aug 24 16:46:26 2020 +0200
Branches: master
https://developer.blender.org/rB734abaa252b40a9aae6992365379556774641269

Cycles: cleanup, remove unused parameter

This parameter was introduced during a revision of the Alembic motion
blur patch, and is not needed anymore.

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

M	intern/cycles/blender/blender_mesh.cpp

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

diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp
index f4354d5166e..b390dffc2b5 100644
--- a/intern/cycles/blender/blender_mesh.cpp
+++ b/intern/cycles/blender/blender_mesh.cpp
@@ -923,8 +923,7 @@ static void create_subd_mesh(Scene *scene,
 
 /* Sync */
 
-static BL::MeshSequenceCacheModifier object_mesh_cache_find(BL::Object &b_ob,
-                                                            BL::Scene /*b_scene*/)
+static BL::MeshSequenceCacheModifier object_mesh_cache_find(BL::Object &b_ob)
 {
   BL::Object::modifiers_iterator b_mod;
 
@@ -943,15 +942,12 @@ static BL::MeshSequenceCacheModifier object_mesh_cache_find(BL::Object &b_ob,
   return BL::MeshSequenceCacheModifier(PointerRNA_NULL);
 }
 
-static void sync_mesh_cached_velocities(BL::Object &b_ob,
-                                        BL::Scene b_scene,
-                                        Scene *scene,
-                                        Mesh *mesh)
+static void sync_mesh_cached_velocities(BL::Object &b_ob, Scene *scene, Mesh *mesh)
 {
   if (scene->need_motion() == Scene::MOTION_NONE)
     return;
 
-  BL::MeshSequenceCacheModifier b_mesh_cache = object_mesh_cache_find(b_ob, b_scene);
+  BL::MeshSequenceCacheModifier b_mesh_cache = object_mesh_cache_find(b_ob);
 
   if (!b_mesh_cache) {
     return;
@@ -1071,7 +1067,7 @@ void BlenderSync::sync_mesh(BL::Depsgraph b_depsgraph,
   }
 
   /* cached velocities (e.g. from alembic archive) */
-  sync_mesh_cached_velocities(b_ob, b_depsgraph.scene(), scene, mesh);
+  sync_mesh_cached_velocities(b_ob, scene, mesh);
 
   /* mesh fluid motion mantaflow */
   sync_mesh_fluid_motion(b_ob, scene, mesh);
@@ -1095,7 +1091,7 @@ void BlenderSync::sync_mesh_motion(BL::Depsgraph b_depsgraph,
   }
 
   /* Cached motion blur already exported. */
-  BL::MeshSequenceCacheModifier mesh_cache = object_mesh_cache_find(b_ob, b_scene);
+  BL::MeshSequenceCacheModifier mesh_cache = object_mesh_cache_find(b_ob);
   if (mesh_cache) {
     return;
   }



More information about the Bf-blender-cvs mailing list