diff options
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_select.c')
-rw-r--r-- | source/blender/editors/space_view3d/view3d_select.c | 69 |
1 files changed, 28 insertions, 41 deletions
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index 9e235d72f26..b7d857fb172 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -1398,9 +1398,7 @@ static int view3d_lasso_select_exec(bContext *C, wmOperator *op) if (changed_multi) { return OPERATOR_FINISHED; } - else { - return OPERATOR_CANCELLED; - } + return OPERATOR_CANCELLED; } return OPERATOR_PASS_THROUGH; } @@ -1542,9 +1540,7 @@ static int object_select_menu_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } - else { - return OPERATOR_CANCELLED; - } + return OPERATOR_CANCELLED; } void VIEW3D_OT_select_menu(wmOperatorType *ot) @@ -1630,37 +1626,34 @@ static Base *object_mouse_select_menu(bContext *C, BLI_linklist_free(linklist, NULL); return base; } - else { - /* UI, full in static array values that we later use in an enum function */ - LinkNode *node; - int i; - memset(object_mouse_select_menu_data, 0, sizeof(object_mouse_select_menu_data)); + /* UI, full in static array values that we later use in an enum function */ + LinkNode *node; + int i; - for (node = linklist, i = 0; node; node = node->next, i++) { - Base *base = node->link; - Object *ob = base->object; - const char *name = ob->id.name + 2; + memset(object_mouse_select_menu_data, 0, sizeof(object_mouse_select_menu_data)); - BLI_strncpy(object_mouse_select_menu_data[i].idname, name, MAX_ID_NAME - 2); - object_mouse_select_menu_data[i].icon = UI_icon_from_id(&ob->id); - } + for (node = linklist, i = 0; node; node = node->next, i++) { + Base *base = node->link; + Object *ob = base->object; + const char *name = ob->id.name + 2; - { - wmOperatorType *ot = WM_operatortype_find("VIEW3D_OT_select_menu", false); - PointerRNA ptr; + BLI_strncpy(object_mouse_select_menu_data[i].idname, name, MAX_ID_NAME - 2); + object_mouse_select_menu_data[i].icon = UI_icon_from_id(&ob->id); + } - WM_operator_properties_create_ptr(&ptr, ot); - RNA_boolean_set(&ptr, "extend", extend); - RNA_boolean_set(&ptr, "deselect", deselect); - RNA_boolean_set(&ptr, "toggle", toggle); - WM_operator_name_call_ptr(C, ot, WM_OP_INVOKE_DEFAULT, &ptr); - WM_operator_properties_free(&ptr); - } + wmOperatorType *ot = WM_operatortype_find("VIEW3D_OT_select_menu", false); + PointerRNA ptr; - BLI_linklist_free(linklist, NULL); - return NULL; - } + WM_operator_properties_create_ptr(&ptr, ot); + RNA_boolean_set(&ptr, "extend", extend); + RNA_boolean_set(&ptr, "deselect", deselect); + RNA_boolean_set(&ptr, "toggle", toggle); + WM_operator_name_call_ptr(C, ot, WM_OP_INVOKE_DEFAULT, &ptr); + WM_operator_properties_free(&ptr); + + BLI_linklist_free(linklist, NULL); + return NULL; } static bool selectbuffer_has_bones(const uint *buffer, const uint hits) @@ -2504,9 +2497,7 @@ static int view3d_select_exec(bContext *C, wmOperator *op) WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene); return OPERATOR_PASS_THROUGH | OPERATOR_FINISHED; } - else { - return OPERATOR_PASS_THROUGH; /* nothing selected, just passthrough */ - } + return OPERATOR_PASS_THROUGH; /* nothing selected, just passthrough */ } static int view3d_select_invoke(bContext *C, wmOperator *op, const wmEvent *event) @@ -3116,12 +3107,10 @@ static int opengl_bone_select_buffer_cmp(const void *sel_a_p, const void *sel_b_ if (sel_a < sel_b) { return -1; } - else if (sel_a > sel_b) { + if (sel_a > sel_b) { return 1; } - else { - return 0; - } + return 0; } static bool do_object_box_select(bContext *C, ViewContext *vc, rcti *rect, const eSelectOp sel_op) @@ -3380,9 +3369,7 @@ static int view3d_box_select_exec(bContext *C, wmOperator *op) if (changed_multi) { return OPERATOR_FINISHED; } - else { - return OPERATOR_CANCELLED; - } + return OPERATOR_CANCELLED; } void VIEW3D_OT_select_box(wmOperatorType *ot) |