diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2021-06-09 18:55:44 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2021-06-09 19:22:45 +0300 |
| commit | 4443c4082ed094baf11b5c6cff280582776466b6 (patch) | |
| tree | e2878edc62e22635e9feb589a5f9590c4fdf5d87 /source/blender/editors/object/object_relations.c | |
| parent | bda8887e0cdfd2fc035b6f1d97f16120f719c6a3 (diff) | |
Cleanup: remove redundant checks which have already been tested
Note that these changes are limited simple cases as these kinds of
changes could allow for errors when refactoring code when the known
state is not so obvious.
Diffstat (limited to 'source/blender/editors/object/object_relations.c')
| -rw-r--r-- | source/blender/editors/object/object_relations.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 2c188e310db..f3433833b5f 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -2570,14 +2570,14 @@ static int convert_proxy_to_override_exec(bContext *C, wmOperator *op) /* Remove the instance empty from this scene, the items now have an overridden collection * instead. */ - if (success && is_override_instancing_object) { + if (is_override_instancing_object) { ED_object_base_free_and_unlink(bmain, scene, ob_proxy_group); } DEG_id_tag_update(&CTX_data_scene(C)->id, ID_RECALC_BASE_FLAGS | ID_RECALC_COPY_ON_WRITE); WM_event_add_notifier(C, NC_WINDOW, NULL); - return success ? OPERATOR_FINISHED : OPERATOR_CANCELLED; + return OPERATOR_FINISHED; } void OBJECT_OT_convert_proxy_to_override(wmOperatorType *ot) |