Commit: 0843d5b0242fa1bd4d8ac1d2ff6e78ec7c56af07
Author: Brecht Van Lommel
Date: Thu Aug 13 11:30:14 2020 +0200
Branches: blender-v2.90-release
https://developer.blender.org/rB0843d5b0242fa1bd4d8ac1d2ff6e78ec7c56af07
Fix T79743: baking still uses cage object after removal
===================================================================
M source/blender/editors/object/object_bake_api.c
===================================================================
diff --git a/source/blender/editors/object/object_bake_api.c
b/source/blender/editors/object/object_bake_api.c
index c4cb21a67f3..edbe4ae9a83 100644
--- a/source/blender/editors/object/object_bake_api.c
+++ b/source/blender/editors/object/object_bake_api.c
@@ -1598,9 +1598,8 @@ static void bake_set_props(wmOperator *op, Scene *scene)
prop = RNA_struct_find_property(op->ptr, "cage_object");
if (!RNA_property_is_set(op->ptr, prop)) {
- if (bake->cage_object) {
- RNA_property_string_set(op->ptr, prop, bake->cage_object->id.name + 2);
- }
+ RNA_property_string_set(
+ op->ptr, prop, (bake->cage_object) ? bake->cage_object->id.name + 2 :
"");
}
prop = RNA_struct_find_property(op->ptr, "normal_space");
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
