diff options
| author | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2020-10-29 19:41:46 +0300 |
|---|---|---|
| committer | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2020-10-29 19:41:46 +0300 |
| commit | d9b22b809484733ba36085f48d768ac6ded42715 (patch) | |
| tree | b4867130b596f72f618d3e13725747f086f62bc3 /intern/cycles/blender/blender_object.cpp | |
| parent | 4bf565460dca4e9f0023f39bbc598f287e02cda9 (diff) | |
| parent | 8c3d42bd0f0160ba58c6a932c0e4c228ce6b0426 (diff) | |
Merge branch 'blender-v2.91-release'
Diffstat (limited to 'intern/cycles/blender/blender_object.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_object.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp index 23faacc15da..d8c4ce9c5df 100644 --- a/intern/cycles/blender/blender_object.cpp +++ b/intern/cycles/blender/blender_object.cpp @@ -218,7 +218,7 @@ Object *BlenderSync::sync_object(BL::Depsgraph &b_depsgraph, /* test if we need to sync */ bool object_updated = false; - if (object_map.add_or_update(scene, &object, b_ob, b_parent, key)) + if (object_map.add_or_update(&object, b_ob, b_parent, key)) object_updated = true; /* mesh sync */ @@ -435,10 +435,10 @@ void BlenderSync::sync_objects(BL::Depsgraph &b_depsgraph, sync_background_light(b_v3d, use_portal); /* handle removed data and modified pointers */ - light_map.post_sync(scene); - geometry_map.post_sync(scene); - object_map.post_sync(scene); - particle_system_map.post_sync(scene); + light_map.post_sync(); + geometry_map.post_sync(); + object_map.post_sync(); + particle_system_map.post_sync(); } if (motion) |