It looks like the issue of Stroke Edit Mode vs Other Edit mode needs to be addressed. If you are in Stroke Edit mode and enter edit mode on a mesh, the mesh edit mode is stuck until you get out of grease edit mode.
Johnny Matthews johnny.matth...@gmail.com On Sun, Nov 30, 2014 at 7:52 AM, Joshua Leung <nore...@git.blender.org> wrote: > Commit: b12dbdd93bff32a26a6b265d46b626491bf4926f > Author: Joshua Leung > Date: Mon Dec 1 02:48:45 2014 +1300 > Branches: master > https://developer.blender.org/rBb12dbdd93bff32a26a6b265d46b626491bf4926f > > Minor tweaks to quick palettes to avoid conflicts > > For now, let's move the GPencil pies to avoid conflicts with dyntopo and > other things > * DQ = Main pie (previously Ctrl-D; DD was too unpredictable) > * DW = Settings pie > > =================================================================== > > 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 77fc0d4..3e6d996 100644 > --- a/source/blender/editors/gpencil/gpencil_ops.c > +++ b/source/blender/editors/gpencil/gpencil_ops.c > @@ -90,8 +90,8 @@ static void ed_keymap_gpencil_general(wmKeyConfig > *keyconf) > RNA_string_set(kmi->ptr, "data_path", > "gpencil_data.use_stroke_edit_mode"); > > /* Pie Menu - For standard tools */ > - WM_keymap_add_menu_pie(keymap, "GPENCIL_PIE_tool_palette", DKEY, > KM_PRESS, KM_CTRL, 0); > - WM_keymap_add_menu_pie(keymap, "GPENCIL_PIE_settings_palette", > QKEY, KM_PRESS, 0, DKEY); > + WM_keymap_add_menu_pie(keymap, "GPENCIL_PIE_tool_palette", QKEY, > KM_PRESS, 0, DKEY); > + WM_keymap_add_menu_pie(keymap, "GPENCIL_PIE_settings_palette", > WKEY, KM_PRESS, 0, DKEY); > } > > /* ==================== */ > > _______________________________________________ > Bf-blender-cvs mailing list > bf-blender-...@blender.org > http://lists.blender.org/mailman/listinfo/bf-blender-cvs > _______________________________________________ Bf-committers mailing list Bf-committers@blender.org http://lists.blender.org/mailman/listinfo/bf-committers
