diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/editors/space_view3d/view3d_header.c | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_header.c')
-rw-r--r-- | source/blender/editors/space_view3d/view3d_header.c | 241 |
1 files changed, 141 insertions, 100 deletions
diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index de3f0392ff0..6984562337c 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -57,9 +57,9 @@ static void do_view3d_header_buttons(bContext *C, void *arg, int event); -#define B_SEL_VERT 110 -#define B_SEL_EDGE 111 -#define B_SEL_FACE 112 +#define B_SEL_VERT 110 +#define B_SEL_EDGE 111 +#define B_SEL_FACE 112 /* -------------------------------------------------------------------- */ /** \name Toggle Matcap Flip Operator @@ -67,31 +67,31 @@ static void do_view3d_header_buttons(bContext *C, void *arg, int event); static int toggle_matcap_flip(bContext *C, wmOperator *UNUSED(op)) { - View3D *v3d = CTX_wm_view3d(C); - - if (v3d) { - v3d->shading.flag ^= V3D_SHADING_MATCAP_FLIP_X; - ED_view3d_shade_update(CTX_data_main(C), v3d, CTX_wm_area(C)); - WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, v3d); - } - else { - Scene *scene = CTX_data_scene(C); - scene->display.shading.flag ^= V3D_SHADING_MATCAP_FLIP_X; - WM_event_add_notifier(C, NC_SCENE | NA_EDITED, v3d); - } - - return OPERATOR_FINISHED; + View3D *v3d = CTX_wm_view3d(C); + + if (v3d) { + v3d->shading.flag ^= V3D_SHADING_MATCAP_FLIP_X; + ED_view3d_shade_update(CTX_data_main(C), v3d, CTX_wm_area(C)); + WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, v3d); + } + else { + Scene *scene = CTX_data_scene(C); + scene->display.shading.flag ^= V3D_SHADING_MATCAP_FLIP_X; + WM_event_add_notifier(C, NC_SCENE | NA_EDITED, v3d); + } + + return OPERATOR_FINISHED; } void VIEW3D_OT_toggle_matcap_flip(wmOperatorType *ot) { - /* identifiers */ - ot->name = "Flip MatCap"; - ot->description = "Flip MatCap"; - ot->idname = "VIEW3D_OT_toggle_matcap_flip"; + /* identifiers */ + ot->name = "Flip MatCap"; + ot->description = "Flip MatCap"; + ot->idname = "VIEW3D_OT_toggle_matcap_flip"; - /* api callbacks */ - ot->exec = toggle_matcap_flip; + /* api callbacks */ + ot->exec = toggle_matcap_flip; } /** \} */ @@ -102,95 +102,136 @@ void VIEW3D_OT_toggle_matcap_flip(wmOperatorType *ot) static void do_view3d_header_buttons(bContext *C, void *UNUSED(arg), int event) { - wmWindow *win = CTX_wm_window(C); - const int ctrl = win->eventstate->ctrl, shift = win->eventstate->shift; - - /* watch it: if sa->win does not exist, check that when calling direct drawing routines */ - - switch (event) { - case B_SEL_VERT: - if (EDBM_selectmode_toggle(C, SCE_SELECT_VERTEX, -1, shift, ctrl)) { - ED_undo_push(C, "Selectmode Set: Vertex"); - } - break; - case B_SEL_EDGE: - if (EDBM_selectmode_toggle(C, SCE_SELECT_EDGE, -1, shift, ctrl)) { - ED_undo_push(C, "Selectmode Set: Edge"); - } - break; - case B_SEL_FACE: - if (EDBM_selectmode_toggle(C, SCE_SELECT_FACE, -1, shift, ctrl)) { - ED_undo_push(C, "Selectmode Set: Face"); - } - break; - default: - break; - } + wmWindow *win = CTX_wm_window(C); + const int ctrl = win->eventstate->ctrl, shift = win->eventstate->shift; + + /* watch it: if sa->win does not exist, check that when calling direct drawing routines */ + + switch (event) { + case B_SEL_VERT: + if (EDBM_selectmode_toggle(C, SCE_SELECT_VERTEX, -1, shift, ctrl)) { + ED_undo_push(C, "Selectmode Set: Vertex"); + } + break; + case B_SEL_EDGE: + if (EDBM_selectmode_toggle(C, SCE_SELECT_EDGE, -1, shift, ctrl)) { + ED_undo_push(C, "Selectmode Set: Edge"); + } + break; + case B_SEL_FACE: + if (EDBM_selectmode_toggle(C, SCE_SELECT_FACE, -1, shift, ctrl)) { + ED_undo_push(C, "Selectmode Set: Face"); + } + break; + default: + break; + } } void uiTemplateEditModeSelection(uiLayout *layout, struct bContext *C) { - Object *obedit = CTX_data_edit_object(C); - uiBlock *block = uiLayoutGetBlock(layout); - - UI_block_func_handle_set(block, do_view3d_header_buttons, NULL); - - if (obedit && (obedit->type == OB_MESH)) { - BMEditMesh *em = BKE_editmesh_from_object(obedit); - uiLayout *row; - - row = uiLayoutRow(layout, true); - block = uiLayoutGetBlock(row); - uiDefIconButBitS(block, UI_BTYPE_TOGGLE, SCE_SELECT_VERTEX, B_SEL_VERT, ICON_VERTEXSEL, - 0, 0, UI_UNIT_X, UI_UNIT_Y, &em->selectmode, 1.0, 0.0, 0, 0, - TIP_("Vertex select - Shift-Click for multiple modes, Ctrl-Click contracts selection")); - uiDefIconButBitS(block, UI_BTYPE_TOGGLE, SCE_SELECT_EDGE, B_SEL_EDGE, ICON_EDGESEL, - 0, 0, ceilf(UI_UNIT_X - U.pixelsize), UI_UNIT_Y, &em->selectmode, 1.0, 0.0, 0, 0, - TIP_("Edge select - Shift-Click for multiple modes, Ctrl-Click expands/contracts selection")); - uiDefIconButBitS(block, UI_BTYPE_TOGGLE, SCE_SELECT_FACE, B_SEL_FACE, ICON_FACESEL, - 0, 0, ceilf(UI_UNIT_X - U.pixelsize), UI_UNIT_Y, &em->selectmode, 1.0, 0.0, 0, 0, - TIP_("Face select - Shift-Click for multiple modes, Ctrl-Click expands selection")); - } + Object *obedit = CTX_data_edit_object(C); + uiBlock *block = uiLayoutGetBlock(layout); + + UI_block_func_handle_set(block, do_view3d_header_buttons, NULL); + + if (obedit && (obedit->type == OB_MESH)) { + BMEditMesh *em = BKE_editmesh_from_object(obedit); + uiLayout *row; + + row = uiLayoutRow(layout, true); + block = uiLayoutGetBlock(row); + uiDefIconButBitS( + block, + UI_BTYPE_TOGGLE, + SCE_SELECT_VERTEX, + B_SEL_VERT, + ICON_VERTEXSEL, + 0, + 0, + UI_UNIT_X, + UI_UNIT_Y, + &em->selectmode, + 1.0, + 0.0, + 0, + 0, + TIP_("Vertex select - Shift-Click for multiple modes, Ctrl-Click contracts selection")); + uiDefIconButBitS(block, + UI_BTYPE_TOGGLE, + SCE_SELECT_EDGE, + B_SEL_EDGE, + ICON_EDGESEL, + 0, + 0, + ceilf(UI_UNIT_X - U.pixelsize), + UI_UNIT_Y, + &em->selectmode, + 1.0, + 0.0, + 0, + 0, + TIP_("Edge select - Shift-Click for multiple modes, Ctrl-Click " + "expands/contracts selection")); + uiDefIconButBitS( + block, + UI_BTYPE_TOGGLE, + SCE_SELECT_FACE, + B_SEL_FACE, + ICON_FACESEL, + 0, + 0, + ceilf(UI_UNIT_X - U.pixelsize), + UI_UNIT_Y, + &em->selectmode, + 1.0, + 0.0, + 0, + 0, + TIP_("Face select - Shift-Click for multiple modes, Ctrl-Click expands selection")); + } } static void uiTemplatePaintModeSelection(uiLayout *layout, struct bContext *C) { - ViewLayer *view_layer = CTX_data_view_layer(C); - Object *ob = OBACT(view_layer); - - /* Gizmos aren't used in paint modes */ - if (!ELEM(ob->mode, OB_MODE_SCULPT, OB_MODE_PARTICLE_EDIT)) { - /* masks aren't used for sculpt and particle painting */ - PointerRNA meshptr; - - RNA_pointer_create(ob->data, &RNA_Mesh, ob->data, &meshptr); - if (ob->mode & (OB_MODE_TEXTURE_PAINT)) { - uiItemR(layout, &meshptr, "use_paint_mask", UI_ITEM_R_ICON_ONLY, "", ICON_NONE); - } - else { - uiLayout *row = uiLayoutRow(layout, true); - uiItemR(row, &meshptr, "use_paint_mask", UI_ITEM_R_ICON_ONLY, "", ICON_NONE); - uiItemR(row, &meshptr, "use_paint_mask_vertex", UI_ITEM_R_ICON_ONLY, "", ICON_NONE); - } - } + ViewLayer *view_layer = CTX_data_view_layer(C); + Object *ob = OBACT(view_layer); + + /* Gizmos aren't used in paint modes */ + if (!ELEM(ob->mode, OB_MODE_SCULPT, OB_MODE_PARTICLE_EDIT)) { + /* masks aren't used for sculpt and particle painting */ + PointerRNA meshptr; + + RNA_pointer_create(ob->data, &RNA_Mesh, ob->data, &meshptr); + if (ob->mode & (OB_MODE_TEXTURE_PAINT)) { + uiItemR(layout, &meshptr, "use_paint_mask", UI_ITEM_R_ICON_ONLY, "", ICON_NONE); + } + else { + uiLayout *row = uiLayoutRow(layout, true); + uiItemR(row, &meshptr, "use_paint_mask", UI_ITEM_R_ICON_ONLY, "", ICON_NONE); + uiItemR(row, &meshptr, "use_paint_mask_vertex", UI_ITEM_R_ICON_ONLY, "", ICON_NONE); + } + } } void uiTemplateHeader3D_mode(uiLayout *layout, struct bContext *C) { - ViewLayer *view_layer = CTX_data_view_layer(C); - Object *ob = OBACT(view_layer); - Object *obedit = CTX_data_edit_object(C); - bGPdata *gpd = CTX_data_gpencil_data(C); - - bool is_paint = ( - ob && !(gpd && (gpd->flag & GP_DATA_STROKE_EDITMODE)) && - ELEM(ob->mode, - OB_MODE_SCULPT, OB_MODE_VERTEX_PAINT, OB_MODE_WEIGHT_PAINT, OB_MODE_TEXTURE_PAINT)); - - uiTemplateEditModeSelection(layout, C); - if ((obedit == NULL) && is_paint) { - uiTemplatePaintModeSelection(layout, C); - } + ViewLayer *view_layer = CTX_data_view_layer(C); + Object *ob = OBACT(view_layer); + Object *obedit = CTX_data_edit_object(C); + bGPdata *gpd = CTX_data_gpencil_data(C); + + bool is_paint = (ob && !(gpd && (gpd->flag & GP_DATA_STROKE_EDITMODE)) && + ELEM(ob->mode, + OB_MODE_SCULPT, + OB_MODE_VERTEX_PAINT, + OB_MODE_WEIGHT_PAINT, + OB_MODE_TEXTURE_PAINT)); + + uiTemplateEditModeSelection(layout, C); + if ((obedit == NULL) && is_paint) { + uiTemplatePaintModeSelection(layout, C); + } } /** \} */ |