diff options
| author | Antonioya <blendergit@gmail.com> | 2018-12-14 18:45:57 +0300 |
|---|---|---|
| committer | Antonioya <blendergit@gmail.com> | 2018-12-14 18:52:12 +0300 |
| commit | 780f0f646da1aac01dc3164fd7d493426aca9e19 (patch) | |
| tree | 453cb60e732399e22279e8eee7a1c9725416c427 /source/blender/editors/gpencil/gpencil_utils.c | |
| parent | a1c8595b090254c1270bb66118304186a3add913 (diff) | |
GP: Rename CTX and OB modes
Part of T59335.
Diffstat (limited to 'source/blender/editors/gpencil/gpencil_utils.c')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_utils.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c index 40c2567f1c0..2ccaea84e6b 100644 --- a/source/blender/editors/gpencil/gpencil_utils.c +++ b/source/blender/editors/gpencil/gpencil_utils.c @@ -1449,7 +1449,7 @@ static bool gp_check_cursor_region(bContext *C, int mval_i[2]) Object *ob = CTX_data_active_object(C); if ((ob == NULL) || - (!ELEM(ob->mode, OB_MODE_GPENCIL_PAINT, OB_MODE_GPENCIL_SCULPT, OB_MODE_GPENCIL_WEIGHT))) + (!ELEM(ob->mode, OB_MODE_PAINT_GPENCIL, OB_MODE_SCULPT_GPENCIL, OB_MODE_WEIGHT_GPENCIL))) { return false; } @@ -1705,13 +1705,13 @@ static void gpencil_verify_brush_type(bContext *C, int newmode) GP_Sculpt_Settings *gset = &ts->gp_sculpt; switch (newmode) { - case OB_MODE_GPENCIL_SCULPT: + case OB_MODE_SCULPT_GPENCIL: gset->flag &= ~GP_SCULPT_SETT_FLAG_WEIGHT_MODE; if ((gset->brushtype < 0) || (gset->brushtype >= GP_SCULPT_TYPE_WEIGHT)) { gset->brushtype = GP_SCULPT_TYPE_PUSH; } break; - case OB_MODE_GPENCIL_WEIGHT: + case OB_MODE_WEIGHT_GPENCIL: gset->flag |= GP_SCULPT_SETT_FLAG_WEIGHT_MODE; if ((gset->weighttype < GP_SCULPT_TYPE_WEIGHT) || (gset->weighttype >= GP_SCULPT_TYPE_MAX)) { gset->weighttype = GP_SCULPT_TYPE_WEIGHT; @@ -1730,34 +1730,34 @@ void ED_gpencil_setup_modes(bContext *C, bGPdata *gpd, int newmode) } switch (newmode) { - case OB_MODE_GPENCIL_EDIT: + case OB_MODE_EDIT_GPENCIL: gpd->flag |= GP_DATA_STROKE_EDITMODE; gpd->flag &= ~GP_DATA_STROKE_PAINTMODE; gpd->flag &= ~GP_DATA_STROKE_SCULPTMODE; gpd->flag &= ~GP_DATA_STROKE_WEIGHTMODE; ED_gpencil_toggle_brush_cursor(C, false, NULL); break; - case OB_MODE_GPENCIL_PAINT: + case OB_MODE_PAINT_GPENCIL: gpd->flag &= ~GP_DATA_STROKE_EDITMODE; gpd->flag |= GP_DATA_STROKE_PAINTMODE; gpd->flag &= ~GP_DATA_STROKE_SCULPTMODE; gpd->flag &= ~GP_DATA_STROKE_WEIGHTMODE; ED_gpencil_toggle_brush_cursor(C, true, NULL); break; - case OB_MODE_GPENCIL_SCULPT: + case OB_MODE_SCULPT_GPENCIL: gpd->flag &= ~GP_DATA_STROKE_EDITMODE; gpd->flag &= ~GP_DATA_STROKE_PAINTMODE; gpd->flag |= GP_DATA_STROKE_SCULPTMODE; gpd->flag &= ~GP_DATA_STROKE_WEIGHTMODE; - gpencil_verify_brush_type(C, OB_MODE_GPENCIL_SCULPT); + gpencil_verify_brush_type(C, OB_MODE_SCULPT_GPENCIL); ED_gpencil_toggle_brush_cursor(C, true, NULL); break; - case OB_MODE_GPENCIL_WEIGHT: + case OB_MODE_WEIGHT_GPENCIL: gpd->flag &= ~GP_DATA_STROKE_EDITMODE; gpd->flag &= ~GP_DATA_STROKE_PAINTMODE; gpd->flag &= ~GP_DATA_STROKE_SCULPTMODE; gpd->flag |= GP_DATA_STROKE_WEIGHTMODE; - gpencil_verify_brush_type(C, OB_MODE_GPENCIL_WEIGHT); + gpencil_verify_brush_type(C, OB_MODE_WEIGHT_GPENCIL); ED_gpencil_toggle_brush_cursor(C, true, NULL); break; default: |