diff options
author | Sybren A. Stüvel <sybren@blender.org> | 2020-07-03 16:42:22 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@blender.org> | 2020-07-03 17:15:01 +0300 |
commit | de7c9f41e613a704f8e3258050b952d2ada60083 (patch) | |
tree | 2fa974caba4f9450e22f8d4da9400387b536dd16 /source/blender/editors/object/object_data_transfer.c | |
parent | 19483125f8da79cb270cb8d6df76b2e67100c089 (diff) |
Cleanup: Editors/Object, Clang-Tidy else-after-return fixes
This addresses warnings from Clang-Tidy's `readability-else-after-return`
rule in the `source/blender/editors/object` module.
No functional changes.
Diffstat (limited to 'source/blender/editors/object/object_data_transfer.c')
-rw-r--r-- | source/blender/editors/object/object_data_transfer.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/source/blender/editors/object/object_data_transfer.c b/source/blender/editors/object/object_data_transfer.c index 0df33255c34..14bf73027d9 100644 --- a/source/blender/editors/object/object_data_transfer.c +++ b/source/blender/editors/object/object_data_transfer.c @@ -254,16 +254,12 @@ static const EnumPropertyItem *dt_layers_select_itemf(bContext *C, if (reverse_transfer) { return dt_layers_select_src_itemf(C, ptr, prop, r_free); } - else { - return dt_layers_select_dst_itemf(C, ptr, prop, r_free); - } - } - else if (reverse_transfer) { return dt_layers_select_dst_itemf(C, ptr, prop, r_free); } - else { - return dt_layers_select_src_itemf(C, ptr, prop, r_free); + if (reverse_transfer) { + return dt_layers_select_dst_itemf(C, ptr, prop, r_free); } + return dt_layers_select_src_itemf(C, ptr, prop, r_free); } /* Note: rna_enum_dt_mix_mode_items enum is from rna_modifier.c */ @@ -381,7 +377,7 @@ static bool data_transfer_exec_is_object_valid(wmOperator *op, me->id.tag &= ~LIB_TAG_DOIT; return true; } - else if (!ID_IS_LINKED(me) && !ID_IS_OVERRIDE_LIBRARY(me)) { + if (!ID_IS_LINKED(me) && !ID_IS_OVERRIDE_LIBRARY(me)) { /* Do not apply transfer operation more than once. */ /* XXX This is not nice regarding vgroups, which are half-Object data... :/ */ BKE_reportf( @@ -857,9 +853,7 @@ static int datalayout_transfer_invoke(bContext *C, wmOperator *op, const wmEvent if (edit_modifier_invoke_properties(C, op, NULL, NULL)) { return datalayout_transfer_exec(C, op); } - else { - return WM_menu_invoke(C, op, event); - } + return WM_menu_invoke(C, op, event); } void OBJECT_OT_datalayout_transfer(wmOperatorType *ot) |