Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brecht@blender.org>2020-08-13 12:30:14 +0300
committerBrecht Van Lommel <brecht@blender.org>2020-08-13 12:30:56 +0300
commit0843d5b0242fa1bd4d8ac1d2ff6e78ec7c56af07 (patch)
tree9193689b26bcdda2ee44dbfb0868e4b1fe18ef95
parent28c1300115c5efbff787afba05c177a584c38846 (diff)
Fix T79743: baking still uses cage object after removal
-rw-r--r--source/blender/editors/object/object_bake_api.c5
1 files changed, 2 insertions, 3 deletions
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");