diff options
| author | Jacques Lucke <jacques@blender.org> | 2021-11-11 20:27:31 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2021-11-11 20:27:31 +0300 |
| commit | 50f32025ac5cad8808dd31ce74a30ff3a31af6de (patch) | |
| tree | aeeb7db5074e1fdf2e5b5a052d16ea05347f8c1e /intern | |
| parent | c9c7658926f8decc9593797363f0e19ae3218f6d (diff) | |
| parent | 393879f30cc093a826f693a903155f95bcbfd34c (diff) | |
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/blender/object.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/blender/object.cpp b/intern/cycles/blender/object.cpp index 0ad3e551b8d..d6c52f7faf9 100644 --- a/intern/cycles/blender/object.cpp +++ b/intern/cycles/blender/object.cpp @@ -294,7 +294,7 @@ Object *BlenderSync::sync_object(BL::Depsgraph &b_depsgraph, object->set_visibility(visibility); - object->set_is_shadow_catcher(b_ob.is_shadow_catcher()); + object->set_is_shadow_catcher(b_ob.is_shadow_catcher() || b_parent.is_shadow_catcher()); float shadow_terminator_shading_offset = get_float(cobject, "shadow_terminator_offset"); object->set_shadow_terminator_shading_offset(shadow_terminator_shading_offset); |