[Bf-blender-cvs] [d5ba36ecc1e] greasepencil-object: Cleanup: Change the "back" parameter on GP editmode toggle operators from int to bool
Joshua Leung
noreply at git.blender.org
Tue May 8 12:38:50 CEST 2018
Commit: d5ba36ecc1e85d5bf6bfc6fefff8cf75cad19b26
Author: Joshua Leung
Date: Tue May 8 12:38:35 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBd5ba36ecc1e85d5bf6bfc6fefff8cf75cad19b26
Cleanup: Change the "back" parameter on GP editmode toggle operators from int to bool
It should have been a bool all along. However, it's debatable whether we should
even have this property to begin with, or a bunch of operators...
===================================================================
M source/blender/editors/gpencil/gpencil_data.c
M source/blender/editors/gpencil/gpencil_edit.c
M source/blender/editors/gpencil/gpencil_ops.c
===================================================================
diff --git a/source/blender/editors/gpencil/gpencil_data.c b/source/blender/editors/gpencil/gpencil_data.c
index 97155d0a48a..be9d6854e2a 100644
--- a/source/blender/editors/gpencil/gpencil_data.c
+++ b/source/blender/editors/gpencil/gpencil_data.c
@@ -1018,21 +1018,21 @@ static int gp_stroke_arrange_exec(bContext *C, wmOperator *op)
BLI_addtail(&gpf->strokes, gps);
}
break;
- /* Bring Forward */
+ /* Bring Forward */
case GP_STROKE_MOVE_UP:
for (LinkData *link = selected.last; link; link = link->prev) {
gps = link->data;
BLI_listbase_link_move(&gpf->strokes, gps, 1);
}
break;
- /* Send Backward */
+ /* Send Backward */
case GP_STROKE_MOVE_DOWN:
for (LinkData *link = selected.first; link; link = link->next) {
gps = link->data;
BLI_listbase_link_move(&gpf->strokes, gps, -1);
}
break;
- /* Send to Back */
+ /* Send to Back */
case GP_STROKE_MOVE_BOTTOM:
for (LinkData *link = selected.last; link; link = link->prev) {
gps = link->data;
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index e941109abad..3deb5d86ef0 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -104,7 +104,7 @@ static int gpencil_editmode_toggle_poll(bContext *C)
static int gpencil_editmode_toggle_exec(bContext *C, wmOperator *op)
{
- const int back = RNA_int_get(op->ptr, "back");
+ const int back = RNA_boolean_get(op->ptr, "back");
bGPdata *gpd = ED_gpencil_data_get_active(C);
bool is_object = false;
@@ -116,8 +116,10 @@ static int gpencil_editmode_toggle_exec(bContext *C, wmOperator *op)
is_object = true;
}
- if (gpd == NULL)
+ if (gpd == NULL) {
+ BKE_report(op->reports, RPT_ERROR, "No active GP data");
return OPERATOR_CANCELLED;
+ }
/* Just toggle editmode flag... */
gpd->flag ^= GP_DATA_STROKE_EDITMODE;
@@ -167,8 +169,9 @@ void GPENCIL_OT_editmode_toggle(wmOperatorType *ot)
/* flags */
ot->flag = OPTYPE_UNDO | OPTYPE_REGISTER;
+
/* properties */
- RNA_def_int(ot->srna, "back", 0, 0, 1, "back", "1 to back previous mode", 0, 1);
+ RNA_def_boolean(ot->srna, "back", 0, "Return to Previous Mode", "Return to previous mode");
}
/* Stroke Paint Mode Management */
@@ -185,7 +188,7 @@ static int gpencil_paintmode_toggle_poll(bContext *C)
static int gpencil_paintmode_toggle_exec(bContext *C, wmOperator *op)
{
- const int back = RNA_int_get(op->ptr, "back");
+ const bool back = RNA_boolean_get(op->ptr, "back");
bGPdata *gpd = ED_gpencil_data_get_active(C);
ToolSettings *ts = CTX_data_tool_settings(C);
@@ -252,8 +255,9 @@ void GPENCIL_OT_paintmode_toggle(wmOperatorType *ot)
/* flags */
ot->flag = OPTYPE_UNDO | OPTYPE_REGISTER;
+
/* properties */
- RNA_def_int(ot->srna, "back", 0, 0, 1, "back", "1 to back previous mode", 0, 1);
+ RNA_def_boolean(ot->srna, "back", 0, "Return to Previous Mode", "Return to previous mode");
}
/* Stroke Sculpt Mode Management */
@@ -270,7 +274,7 @@ static int gpencil_sculptmode_toggle_poll(bContext *C)
static int gpencil_sculptmode_toggle_exec(bContext *C, wmOperator *op)
{
- const int back = RNA_int_get(op->ptr, "back");
+ const bool back = RNA_boolean_get(op->ptr, "back");
bGPdata *gpd = ED_gpencil_data_get_active(C);
bool is_object = false;
@@ -328,8 +332,9 @@ void GPENCIL_OT_sculptmode_toggle(wmOperatorType *ot)
/* flags */
ot->flag = OPTYPE_UNDO | OPTYPE_REGISTER;
+
/* properties */
- RNA_def_int(ot->srna, "back", 0, 0, 1, "back", "1 to back previous mode", 0, 1);
+ RNA_def_boolean(ot->srna, "back", 0, "Return to Previous Mode", "Return to previous mode");
}
/* Stroke Weight Paint Mode Management */
@@ -346,7 +351,7 @@ static int gpencil_weightmode_toggle_poll(bContext *C)
static int gpencil_weightmode_toggle_exec(bContext *C, wmOperator *op)
{
- const int back = RNA_int_get(op->ptr, "back");
+ const bool back = RNA_boolean_get(op->ptr, "back");
bGPdata *gpd = ED_gpencil_data_get_active(C);
bool is_object = false;
@@ -404,8 +409,9 @@ void GPENCIL_OT_weightmode_toggle(wmOperatorType *ot)
/* flags */
ot->flag = OPTYPE_UNDO | OPTYPE_REGISTER;
+
/* properties */
- RNA_def_int(ot->srna, "back", 0, 0, 1, "back", "1 to back previous mode", 0, 1);
+ RNA_def_boolean(ot->srna, "back", 0, "Return to Previous Mode", "Return to previous mode");
}
/* ************************************************ */
diff --git a/source/blender/editors/gpencil/gpencil_ops.c b/source/blender/editors/gpencil/gpencil_ops.c
index 1eeade8d191..f3aa2840110 100644
--- a/source/blender/editors/gpencil/gpencil_ops.c
+++ b/source/blender/editors/gpencil/gpencil_ops.c
@@ -313,10 +313,10 @@ static void ed_keymap_gpencil_editing(wmKeyConfig *keyconf)
/* Exit EditMode */
kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_editmode_toggle", TABKEY, KM_PRESS, 0, 0);
- RNA_int_set(kmi->ptr, "back", 1);
+ RNA_boolean_set(kmi->ptr, "back", 1);
kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_editmode_toggle", TABKEY, KM_PRESS, KM_CTRL, 0);
- RNA_int_set(kmi->ptr, "back", 1);
+ RNA_boolean_set(kmi->ptr, "back", 1);
/* Brush Settings */
/* NOTE: We cannot expose these in the standard keymap, as they will interfere with regular hotkeys
@@ -430,10 +430,10 @@ static void ed_keymap_gpencil_editing(wmKeyConfig *keyconf)
/* Enter PaintMode */
kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_paintmode_toggle", DKEY, KM_PRESS, 0, 0);
- RNA_int_set(kmi->ptr, "back", 1);
+ RNA_boolean_set(kmi->ptr, "back", 1);
/* Enter SculptMode */
kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_sculptmode_toggle", EKEY, KM_PRESS, 0, 0);
- RNA_int_set(kmi->ptr, "back", 1);
+ RNA_boolean_set(kmi->ptr, "back", 1);
/* menu - add GP object (3d view only) */
WM_keymap_add_item(keymap, "OBJECT_OT_gpencil_add", AKEY, KM_PRESS, KM_SHIFT, 0);
@@ -567,10 +567,10 @@ static void ed_keymap_gpencil_painting(wmKeyConfig *keyconf)
/* Exit PaintMode */
kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_editmode_toggle", TABKEY, KM_PRESS, 0, 0);
- RNA_int_set(kmi->ptr, "back", 1);
+ RNA_boolean_set(kmi->ptr, "back", 1);
kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_paintmode_toggle", TABKEY, KM_PRESS, KM_CTRL, 0);
- RNA_int_set(kmi->ptr, "back", 1);
+ RNA_boolean_set(kmi->ptr, "back", 1);
/* Select drawing brush using index */
kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_brush_select", ONEKEY, KM_PRESS, 0, 0);
@@ -604,10 +604,10 @@ static void ed_keymap_gpencil_painting(wmKeyConfig *keyconf)
/* Enter EditMode */
kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_editmode_toggle", TABKEY, KM_PRESS, KM_SHIFT, 0);
- RNA_int_set(kmi->ptr, "back", 1);
+ RNA_boolean_set(kmi->ptr, "back", 1);
/* Enter SculptMode */
kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_sculptmode_toggle", EKEY, KM_PRESS, 0, 0);
- RNA_int_set(kmi->ptr, "back", 1);
+ RNA_boolean_set(kmi->ptr, "back", 1);
/* menu draw specials (add two keys to make more easy for user) */
WM_keymap_add_menu(keymap, "GPENCIL_MT_gpencil_draw_specials", WKEY, KM_PRESS, 0, 0);
@@ -628,10 +628,10 @@ static void ed_keymap_gpencil_sculpting(wmKeyConfig *keyconf)
/* Exit SculptMode */
kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_editmode_toggle", TABKEY, KM_PRESS, 0, 0);
- RNA_int_set(kmi->ptr, "back", 1);
+ RNA_boolean_set(kmi->ptr, "back", 1);
kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_sculptmode_toggle", TABKEY, KM_PRESS, KM_CTRL, 0);
- RNA_int_set(kmi->ptr, "back", 1);
+ RNA_boolean_set(kmi->ptr, "back", 1);
/* Selection */
ed_keymap_gpencil_selection(keymap);
@@ -668,10 +668,10 @@ static void ed_keymap_gpencil_sculpting(wmKeyConfig *keyconf)
/* Enter EditMode */
kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_editmode_toggle", TABKEY, KM_PRESS, KM_SHIFT, 0);
- RNA_int_set(kmi->ptr, "back", 1);
+ RNA_boolean_set(kmi->ptr, "back", 1);
/* Enter PaintMode */
kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_paintmode_toggle", DKEY, KM_PRESS, 0, 0);
- RNA_int_set(kmi->ptr, "back", 1);
+ RNA_boolean_set(kmi->ptr, "back", 1);
}
/* Stroke Weight Paint Keymap - Only when weight is enabled */
@@ -685,10 +685,10 @@ static void ed_keymap_gpencil_weightpainting(wmKeyConfig *keyconf)
/* Exit WeightMode */
kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_editmode_toggle", TABKEY, KM_PRESS, 0, 0);
- RNA_int_set(kmi->ptr, "back", 1);
+ RNA_boolean_set(kmi->ptr, "back", 1);
kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_weightmode_toggle", TABKEY, KM_PRESS, KM_CTRL, 0);
- RNA_int_set(kmi->ptr, "back", 1);
+ RNA_boolean_set(kmi->ptr, "back", 1);
/* Selection */
ed_keymap_gpencil_selection(keymap);
@@ -713,10 +713,10 @@ static void ed_keymap_gpencil_weightpainting(wmKeyConfig *keyconf)
/* Enter EditMode */
kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_editmode_toggle", TABKEY, KM_PRESS, KM_SHIFT, 0);
- RNA_int_set(kmi->ptr, "back", 1);
+ RNA_boolean_set(kmi->ptr, "back", 1);
/* Enter PaintMode */
kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_paintmode_toggle", DKEY, KM_PRESS, 0, 0);
- RNA_int_set(kmi->ptr, "back", 1);
+ RNA_boolean_set(kmi->ptr, "back", 1);
}
/* ==================== */
More information about the Bf-blender-cvs
mailing list