[Bf-blender-cvs] [b44e74cd77a] greasepencil-object: Cleanup inactive code
Antonio Vazquez
noreply at git.blender.org
Wed May 30 17:47:39 CEST 2018
Commit: b44e74cd77a2629f012e2b15eaea06517d9d15e4
Author: Antonio Vazquez
Date: Wed May 30 17:47:30 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBb44e74cd77a2629f012e2b15eaea06517d9d15e4
Cleanup inactive code
===================================================================
M source/blender/editors/gpencil/gpencil_ops.c
===================================================================
diff --git a/source/blender/editors/gpencil/gpencil_ops.c b/source/blender/editors/gpencil/gpencil_ops.c
index 5e696bcece2..11421e57f49 100644
--- a/source/blender/editors/gpencil/gpencil_ops.c
+++ b/source/blender/editors/gpencil/gpencil_ops.c
@@ -314,14 +314,6 @@ static void ed_keymap_gpencil_editing(wmKeyConfig *keyconf)
/* ----------------------------------------------- */
-#if 0 /* GPXX: Remove */
- /* Exit EditMode */
- kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_editmode_toggle", TABKEY, KM_PRESS, 0, 0);
- RNA_boolean_set(kmi->ptr, "back", 1);
-
- kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_editmode_toggle", TABKEY, KM_PRESS, KM_CTRL, 0);
- RNA_boolean_set(kmi->ptr, "back", 1);
-#endif
/* Brush Settings */
/* NOTE: We cannot expose these in the standard keymap, as they will interfere with regular hotkeys
* in other modes. However, when we are dealing with Stroke Edit Mode, we know for certain
@@ -432,15 +424,6 @@ static void ed_keymap_gpencil_editing(wmKeyConfig *keyconf)
ED_keymap_proportional_cycle(keyconf, keymap);
ED_keymap_proportional_editmode(keyconf, keymap, true);
-#if 0 /* GPXX: Remove */
- /* Enter PaintMode */
- kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_paintmode_toggle", DKEY, KM_PRESS, 0, 0);
- 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_boolean_set(kmi->ptr, "back", 1);
-#endif
-
/* menu - add GP object (3d view only) */
WM_keymap_add_item(keymap, "OBJECT_OT_gpencil_add", AKEY, KM_PRESS, KM_SHIFT, 0);
@@ -571,37 +554,6 @@ static void ed_keymap_gpencil_painting(wmKeyConfig *keyconf)
/* set poll callback - so that this keymap only gets enabled when stroke paintmode is enabled */
keymap->poll = gp_stroke_paintmode_poll;
-#if 0 /* GPXX: Remove */
- /* Exit PaintMode */
- kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_editmode_toggle", TABKEY, KM_PRESS, 0, 0);
- RNA_boolean_set(kmi->ptr, "back", 1);
-
- kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_paintmode_toggle", TABKEY, KM_PRESS, KM_CTRL, 0);
- 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);
- RNA_int_set(kmi->ptr, "index", 0);
- kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_brush_select", TWOKEY, KM_PRESS, 0, 0);
- RNA_int_set(kmi->ptr, "index", 1);
- kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_brush_select", THREEKEY, KM_PRESS, 0, 0);
- RNA_int_set(kmi->ptr, "index", 2);
- kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_brush_select", FOURKEY, KM_PRESS, 0, 0);
- RNA_int_set(kmi->ptr, "index", 3);
- kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_brush_select", FIVEKEY, KM_PRESS, 0, 0);
- RNA_int_set(kmi->ptr, "index", 4);
- kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_brush_select", SIXKEY, KM_PRESS, 0, 0);
- RNA_int_set(kmi->ptr, "index", 5);
- kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_brush_select", SEVENKEY, KM_PRESS, 0, 0);
- RNA_int_set(kmi->ptr, "index", 6);
- kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_brush_select", EIGHTKEY, KM_PRESS, 0, 0);
- RNA_int_set(kmi->ptr, "index", 7);
- kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_brush_select", NINEKEY, KM_PRESS, 0, 0);
- RNA_int_set(kmi->ptr, "index", 8);
- kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_brush_select", ZEROKEY, KM_PRESS, 0, 0);
- RNA_int_set(kmi->ptr, "index", 9);
-#endif
-
/* FKEY = Brush Size */
kmi = WM_keymap_add_item(keymap, "WM_OT_radial_control", FKEY, KM_PRESS, 0, 0);
RNA_string_set(kmi->ptr, "data_path_primary", "tool_settings.gpencil_paint.brush.size");
@@ -610,15 +562,6 @@ static void ed_keymap_gpencil_painting(wmKeyConfig *keyconf)
kmi = WM_keymap_add_item(keymap, "WM_OT_radial_control", FKEY, KM_PRESS, KM_CTRL, 0);
RNA_string_set(kmi->ptr, "data_path_primary", "user_preferences.edit.grease_pencil_eraser_radius");
-#if 0 /* GPXX: Remove */
- /* Enter EditMode */
- kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_editmode_toggle", TABKEY, KM_PRESS, KM_SHIFT, 0);
- 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_boolean_set(kmi->ptr, "back", 1);
-#endif
-
/* 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);
WM_keymap_add_menu(keymap, "GPENCIL_MT_gpencil_draw_specials", XKEY, KM_PRESS, 0, 0);
@@ -636,15 +579,6 @@ static void ed_keymap_gpencil_sculpting(wmKeyConfig *keyconf)
/* set poll callback - so that this keymap only gets enabled when stroke sculptmode is enabled */
keymap->poll = gp_stroke_sculptmode_poll;
-#if 0 /* GPXX: Remove */
- /* Exit SculptMode */
- kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_editmode_toggle", TABKEY, KM_PRESS, 0, 0);
- RNA_boolean_set(kmi->ptr, "back", 1);
-
- kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_sculptmode_toggle", TABKEY, KM_PRESS, KM_CTRL, 0);
- RNA_boolean_set(kmi->ptr, "back", 1);
-#endif
-
/* Selection */
ed_keymap_gpencil_selection(keymap);
@@ -658,34 +592,6 @@ static void ed_keymap_gpencil_sculpting(wmKeyConfig *keyconf)
kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_multiedit_toggle", QKEY, KM_PRESS, KM_SHIFT, 0);
RNA_boolean_set(kmi->ptr, "toggle_visibility", 1);
-#if 0 /* GPXX: Remove */
- /* Select sculpt brush using index */
- kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_sculpt_select", ONEKEY, KM_PRESS, 0, 0);
- RNA_int_set(kmi->ptr, "index", 0);
- kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_sculpt_select", TWOKEY, KM_PRESS, 0, 0);
- RNA_int_set(kmi->ptr, "index", 1);
- kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_sculpt_select", THREEKEY, KM_PRESS, 0, 0);
- RNA_int_set(kmi->ptr, "index", 2);
- kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_sculpt_select", FOURKEY, KM_PRESS, 0, 0);
- RNA_int_set(kmi->ptr, "index", 3);
- kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_sculpt_select", FIVEKEY, KM_PRESS, 0, 0);
- RNA_int_set(kmi->ptr, "index", 4);
- kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_sculpt_select", SIXKEY, KM_PRESS, 0, 0);
- RNA_int_set(kmi->ptr, "index", 5);
- kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_sculpt_select", SEVENKEY, KM_PRESS, 0, 0);
- RNA_int_set(kmi->ptr, "index", 6);
- kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_sculpt_select", EIGHTKEY, KM_PRESS, 0, 0);
- RNA_int_set(kmi->ptr, "index", 7);
- kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_sculpt_select", NINEKEY, KM_PRESS, 0, 0);
- RNA_int_set(kmi->ptr, "index", 8);
-
- /* Enter EditMode */
- kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_editmode_toggle", TABKEY, KM_PRESS, KM_SHIFT, 0);
- 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_boolean_set(kmi->ptr, "back", 1);
-#endif
}
/* Stroke Weight Paint Keymap - Only when weight is enabled */
@@ -697,15 +603,6 @@ static void ed_keymap_gpencil_weightpainting(wmKeyConfig *keyconf)
/* set poll callback - so that this keymap only gets enabled when stroke sculptmode is enabled */
keymap->poll = gp_stroke_weightmode_poll;
-#if 0 /* GPXX: Remove */
- /* Exit WeightMode */
- kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_editmode_toggle", TABKEY, KM_PRESS, 0, 0);
- RNA_boolean_set(kmi->ptr, "back", 1);
-
- kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_weightmode_toggle", TABKEY, KM_PRESS, KM_CTRL, 0);
- RNA_boolean_set(kmi->ptr, "back", 1);
-#endif
-
/* Selection */
ed_keymap_gpencil_selection(keymap);
@@ -727,15 +624,6 @@ static void ed_keymap_gpencil_weightpainting(wmKeyConfig *keyconf)
kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_multiedit_toggle", QKEY, KM_PRESS, KM_SHIFT, 0);
RNA_boolean_set(kmi->ptr, "toggle_visibility", 1);
-#if 0 /* GPXX: Remove */
- /* Enter EditMode */
- kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_editmode_toggle", TABKEY, KM_PRESS, KM_SHIFT, 0);
- 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_boolean_set(kmi->ptr, "back", 1);
-#endif
-
}
/* ==================== */
More information about the Bf-blender-cvs
mailing list