Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonioya <blendergit@gmail.com>2018-12-14 18:45:57 +0300
committerAntonioya <blendergit@gmail.com>2018-12-14 18:52:12 +0300
commit780f0f646da1aac01dc3164fd7d493426aca9e19 (patch)
tree453cb60e732399e22279e8eee7a1c9725416c427 /source/blender/editors/gpencil/gpencil_edit.c
parenta1c8595b090254c1270bb66118304186a3add913 (diff)
GP: Rename CTX and OB modes
Part of T59335.
Diffstat (limited to 'source/blender/editors/gpencil/gpencil_edit.c')
-rw-r--r--source/blender/editors/gpencil/gpencil_edit.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index 072f4d0e317..916a268dc57 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -172,7 +172,7 @@ static int gpencil_editmode_toggle_exec(bContext *C, wmOperator *op)
}
/* set mode */
if (gpd->flag & GP_DATA_STROKE_EDITMODE) {
- mode = OB_MODE_GPENCIL_EDIT;
+ mode = OB_MODE_EDIT_GPENCIL;
}
else {
mode = OB_MODE_OBJECT;
@@ -301,7 +301,7 @@ static int gpencil_paintmode_toggle_exec(bContext *C, wmOperator *op)
gpd->flag ^= GP_DATA_STROKE_PAINTMODE;
/* set mode */
if (gpd->flag & GP_DATA_STROKE_PAINTMODE) {
- mode = OB_MODE_GPENCIL_PAINT;
+ mode = OB_MODE_PAINT_GPENCIL;
}
else {
mode = OB_MODE_OBJECT;
@@ -316,7 +316,7 @@ static int gpencil_paintmode_toggle_exec(bContext *C, wmOperator *op)
ob->mode = mode;
}
- if (mode == OB_MODE_GPENCIL_PAINT) {
+ if (mode == OB_MODE_PAINT_GPENCIL) {
/* be sure we have brushes */
BKE_paint_ensure(ts, (Paint **)&ts->gp_paint);
Paint *paint = &ts->gp_paint->paint;
@@ -400,7 +400,7 @@ static int gpencil_sculptmode_toggle_exec(bContext *C, wmOperator *op)
gpd->flag ^= GP_DATA_STROKE_SCULPTMODE;
/* set mode */
if (gpd->flag & GP_DATA_STROKE_SCULPTMODE) {
- mode = OB_MODE_GPENCIL_SCULPT;
+ mode = OB_MODE_SCULPT_GPENCIL;
}
else {
mode = OB_MODE_OBJECT;
@@ -488,7 +488,7 @@ static int gpencil_weightmode_toggle_exec(bContext *C, wmOperator *op)
gpd->flag ^= GP_DATA_STROKE_WEIGHTMODE;
/* set mode */
if (gpd->flag & GP_DATA_STROKE_WEIGHTMODE) {
- mode = OB_MODE_GPENCIL_WEIGHT;
+ mode = OB_MODE_WEIGHT_GPENCIL;
}
else {
mode = OB_MODE_OBJECT;