diff options
author | Fabian Schempp <fabianschempp@googlemail.com> | 2021-08-22 09:51:26 +0300 |
---|---|---|
committer | Fabian Schempp <fabianschempp@googlemail.com> | 2021-08-22 09:51:26 +0300 |
commit | 38b12c763f966ea685472f9d8faca3a299b07fb6 (patch) | |
tree | 960c60aa52522d87d805b89e8b31507b9b3da2e5 /intern/cycles/blender/blender_mesh.cpp | |
parent | 49a16a1ca874a2b3939b3eee8d4d2b0cacad8b96 (diff) | |
parent | 721fad37a1981a564404b5f708a405503dc18f45 (diff) |
Merge branch 'master' into soc-2021-porting-modifiers-to-nodes_allsoc-2021-porting-modifiers-to-nodes_all
Diffstat (limited to 'intern/cycles/blender/blender_mesh.cpp')
-rw-r--r-- | intern/cycles/blender/blender_mesh.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp index d1042277183..ebba6981502 100644 --- a/intern/cycles/blender/blender_mesh.cpp +++ b/intern/cycles/blender/blender_mesh.cpp @@ -1078,7 +1078,7 @@ static void sync_mesh_cached_velocities(BL::Object &b_ob, Scene *scene, Mesh *me return; } - BL::MeshSequenceCacheModifier b_mesh_cache = object_mesh_cache_find(b_ob, true); + BL::MeshSequenceCacheModifier b_mesh_cache = object_mesh_cache_find(b_ob, true, nullptr); if (!b_mesh_cache) { return; @@ -1241,7 +1241,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, true); + BL::MeshSequenceCacheModifier mesh_cache = object_mesh_cache_find(b_ob, true, nullptr); if (mesh_cache) { return; } |