Fix T79743: baking still uses cage object after removal

2020-08-13 11:30:14 +02:00
parent 28c1300115
commit 0843d5b024
1 changed files with 2 additions and 3 deletions
--- 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");