Fix Cycles to mostly work with render layer / depsgraph changes.

[blender.git] / intern / cycles / blender / blender_mesh.cpp

diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp
index bda6306d11f6bfcc9ee7a90357a788666cc28538..9c8d317e6de26cc684ee13c920e48fa063e2ffa4 100644 (file)
--- a/intern/cycles/blender/blender_mesh.cpp
+++ b/intern/cycles/blender/blender_mesh.cpp
@@ -1067,7 +1067,8 @@ static void sync_mesh_fluid_motion(BL::Object& b_ob, Scene *scene, Mesh *mesh)
        }
 }
 
-Mesh *BlenderSync::sync_mesh(BL::Object& b_ob,
+Mesh *BlenderSync::sync_mesh(BL::Depsgraph& b_depsgraph,
+                             BL::Object& b_ob,
                              BL::Object& b_ob_instance,
                              bool object_updated,
                              bool hide_tris)
@@ -1186,7 +1187,7 @@ Mesh *BlenderSync::sync_mesh(BL::Object& b_ob,
                BL::Mesh b_mesh = object_to_mesh(b_data,
                                                 b_ob,
                                                 b_scene,
-                                                b_view_layer,
+                                                b_depsgraph.view_layer(),
                                                 true,
                                                 !preview,
                                                 need_undeformed,
@@ -1204,7 +1205,7 @@ Mesh *BlenderSync::sync_mesh(BL::Object& b_ob,
                        }
 
                        if(view_layer.use_hair && mesh->subdivision_type == Mesh::SUBDIVISION_NONE)
-                               sync_curves(mesh, b_mesh, b_ob, false);
+                               sync_curves(b_depsgraph, mesh, b_mesh, b_ob, false);
 
                        if(can_free_caches) {
                                b_ob.cache_release();
@@ -1231,7 +1232,8 @@ Mesh *BlenderSync::sync_mesh(BL::Object& b_ob,
        return mesh;
 }
 
-void BlenderSync::sync_mesh_motion(BL::Object& b_ob,
+void BlenderSync::sync_mesh_motion(BL::Depsgraph& b_depsgraph,
+                                   BL::Object& b_ob,
                                    Object *object,
                                    float motion_time)
 {
@@ -1301,7 +1303,7 @@ void BlenderSync::sync_mesh_motion(BL::Object& b_ob,
                b_mesh = object_to_mesh(b_data,
                                        b_ob,
                                        b_scene,
-                                       b_view_layer,
+                                       b_depsgraph.view_layer(),
                                        true,
                                        !preview,
                                        false,
@@ -1412,7 +1414,7 @@ void BlenderSync::sync_mesh_motion(BL::Object& b_ob,
 
        /* hair motion */
        if(numkeys)
-               sync_curves(mesh, b_mesh, b_ob, true, time_index);
+               sync_curves(b_depsgraph, mesh, b_mesh, b_ob, true, time_index);
 
        /* free derived mesh */
        b_data.meshes.remove(b_mesh, false, true, false);