[Bf-blender-cvs] [8b9bd8a5574] greasepencil-object: Cleanup: Operator properties for "GPENCIL_OT_multiedit_toggle"
Joshua Leung
noreply at git.blender.org
Tue May 8 12:43:50 CEST 2018
Commit: 8b9bd8a55746e14002ad86188f66d530e69e2956
Author: Joshua Leung
Date: Tue May 8 12:43:47 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB8b9bd8a55746e14002ad86188f66d530e69e2956
Cleanup: Operator properties for "GPENCIL_OT_multiedit_toggle"
* RNA_int -> RNA_boolean
* Rename "lines" to "toggle_visibility", as the previous name was ambiguous
===================================================================
M source/blender/editors/gpencil/gpencil_edit.c
M source/blender/editors/gpencil/gpencil_ops.c
===================================================================
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index 3deb5d86ef0..38ba19cd34e 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -477,7 +477,7 @@ void GPENCIL_OT_selection_opacity_toggle(wmOperatorType *ot)
static int gpencil_multiedit_toggle_exec(bContext *C, wmOperator *op)
{
bGPdata *gpd = ED_gpencil_data_get_active(C);
- const int lines = RNA_int_get(op->ptr, "lines");
+ const bool lines = RNA_boolean_get(op->ptr, "lines");
if (gpd == NULL)
return OPERATOR_CANCELLED;
@@ -501,7 +501,7 @@ void GPENCIL_OT_multiedit_toggle(wmOperatorType *ot)
/* identifiers */
ot->name = "Edit Lines Toggle";
ot->idname = "GPENCIL_OT_multiedit_toggle";
- ot->description = "Enable/Disable edit lines support";
+ ot->description = "Enable/disable edit lines support";
/* callbacks */
ot->exec = gpencil_multiedit_toggle_exec;
@@ -511,7 +511,7 @@ void GPENCIL_OT_multiedit_toggle(wmOperatorType *ot)
ot->flag = OPTYPE_UNDO | OPTYPE_REGISTER;
/* properties */
- RNA_def_int(ot->srna, "lines", 0, 0, 1, "lines", "1 to toggle display lines only", 0, 1);
+ RNA_def_boolean(ot->srna, "toggle_visibility", 0, "Toggle Visibility Only", "Toggle visibility of edit lines only");
}
/* ************** Duplicate Selected Strokes **************** */
diff --git a/source/blender/editors/gpencil/gpencil_ops.c b/source/blender/editors/gpencil/gpencil_ops.c
index f3aa2840110..d347114d80a 100644
--- a/source/blender/editors/gpencil/gpencil_ops.c
+++ b/source/blender/editors/gpencil/gpencil_ops.c
@@ -393,10 +393,10 @@ static void ed_keymap_gpencil_editing(wmKeyConfig *keyconf)
/* toogle multiedit support */
kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_multiedit_toggle", QKEY, KM_PRESS, 0, 0);
- RNA_int_set(kmi->ptr, "lines", 0);
+ RNA_boolean_set(kmi->ptr, "toggle_visibility", 0);
kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_multiedit_toggle", QKEY, KM_PRESS, KM_SHIFT, 0);
- RNA_int_set(kmi->ptr, "lines", 1);
+ RNA_boolean_set(kmi->ptr, "toggle_visibility", 1);
/* Isolate Layer */
WM_keymap_add_item(keymap, "GPENCIL_OT_layer_isolate", PADASTERKEY, KM_PRESS, 0, 0);
@@ -641,10 +641,10 @@ static void ed_keymap_gpencil_sculpting(wmKeyConfig *keyconf)
/* toogle multiedit support */
kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_multiedit_toggle", QKEY, KM_PRESS, 0, 0);
- RNA_int_set(kmi->ptr, "lines", 0);
+ RNA_boolean_set(kmi->ptr, "toggle_visibility", 0);
kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_multiedit_toggle", QKEY, KM_PRESS, KM_SHIFT, 0);
- RNA_int_set(kmi->ptr, "lines", 1);
+ RNA_boolean_set(kmi->ptr, "toggle_visibility", 1);
/* Select sculpt brush using index */
kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_sculpt_select", ONEKEY, KM_PRESS, 0, 0);
@@ -706,10 +706,10 @@ static void ed_keymap_gpencil_weightpainting(wmKeyConfig *keyconf)
/* toogle multiedit support */
kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_multiedit_toggle", QKEY, KM_PRESS, 0, 0);
- RNA_int_set(kmi->ptr, "lines", 0);
+ RNA_boolean_set(kmi->ptr, "toggle_visibility", 0);
kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_multiedit_toggle", QKEY, KM_PRESS, KM_SHIFT, 0);
- RNA_int_set(kmi->ptr, "lines", 1);
+ RNA_boolean_set(kmi->ptr, "toggle_visibility", 1);
/* Enter EditMode */
kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_editmode_toggle", TABKEY, KM_PRESS, KM_SHIFT, 0);
More information about the Bf-blender-cvs
mailing list