diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2020-08-13 12:50:07 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2020-08-13 12:50:07 +0300 |
| commit | 46aa30240005bfbb527e1f3e2a9279eb61e19a54 (patch) | |
| tree | 1cf399b7b6d2c7ce57cc35b1a58656de43cfb93d /source/blender/editors/object/object_bake_api.c | |
| parent | 7c380119a7089ed98a280bc3d2202c0345a0d1c7 (diff) | |
| parent | ada98869dfa16272cd7db1c01d33a7002dc38195 (diff) | |
Merge branch 'blender-v2.90-release'
Diffstat (limited to 'source/blender/editors/object/object_bake_api.c')
| -rw-r--r-- | source/blender/editors/object/object_bake_api.c | 5 |
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 cb92fab3cb0..eb8b976320f 100644 --- a/source/blender/editors/object/object_bake_api.c +++ b/source/blender/editors/object/object_bake_api.c @@ -1596,9 +1596,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"); |