diff options
| author | YimingWu <xp8110@outlook.com> | 2020-06-04 13:57:28 +0300 |
|---|---|---|
| committer | YimingWu <xp8110@outlook.com> | 2020-06-04 13:57:28 +0300 |
| commit | bfbf0bb7f7a0191b65fc724d5dfea225e6293c6b (patch) | |
| tree | 042f37d28c9e1cf0ce5a0fb4fd4235288f62d36e /intern/cycles/blender/blender_object.cpp | |
| parent | 3b52dfe549f0c2fca7e0cd499b85fb098e9b4da9 (diff) | |
| parent | 78017916f7c7a8ec8907c9b993214ff8ec3c3557 (diff) | |
Merge remote-tracking branch 'origin/master' into temp-lanpr-reviewtemp-lanpr-review
# Conflicts:
# release/datafiles/locale
# release/scripts/addons
Diffstat (limited to 'intern/cycles/blender/blender_object.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_object.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp index a461982a538..c28586d0f63 100644 --- a/intern/cycles/blender/blender_object.cpp +++ b/intern/cycles/blender/blender_object.cpp @@ -238,6 +238,12 @@ Object *BlenderSync::sync_object(BL::Depsgraph &b_depsgraph, object_updated = true; } + float shadow_terminator_offset = get_float(cobject, "shadow_terminator_offset"); + if (shadow_terminator_offset != object->shadow_terminator_offset) { + object->shadow_terminator_offset = shadow_terminator_offset; + object_updated = true; + } + /* sync the asset name for Cryptomatte */ BL::Object parent = b_ob.parent(); ustring parent_name; |