[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52772] trunk/blender/source/blender/ editors: fix [#33412] Jump to next frame broken in grease pencil mode
Campbell Barton
ideasman42 at gmail.com
Tue Dec 4 18:38:56 CET 2012
Revision: 52772
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52772
Author: campbellbarton
Date: 2012-12-04 17:38:55 +0000 (Tue, 04 Dec 2012)
Log Message:
-----------
fix [#33412] Jump to next frame broken in grease pencil mode
allow arrow keys while in grease pencil session, otherwise you can't change frames.
also correct out-of-date comments.
Modified Paths:
--------------
trunk/blender/source/blender/editors/gpencil/gpencil_paint.c
trunk/blender/source/blender/editors/space_view3d/view3d_select.c
Modified: trunk/blender/source/blender/editors/gpencil/gpencil_paint.c
===================================================================
--- trunk/blender/source/blender/editors/gpencil/gpencil_paint.c 2012-12-04 15:37:01 UTC (rev 52771)
+++ trunk/blender/source/blender/editors/gpencil/gpencil_paint.c 2012-12-04 17:38:55 UTC (rev 52772)
@@ -1815,10 +1815,16 @@
* better in tools that immediately apply
* in 3D space.
*/
-
+
/* we don't pass on key events, GP is used with key-modifiers - prevents Dkey to insert drivers */
- if (ISKEYBOARD(event->type))
- estate = OPERATOR_RUNNING_MODAL;
+ if (ISKEYBOARD(event->type)) {
+ if (ELEM4(event->type, LEFTARROWKEY, DOWNARROWKEY, RIGHTARROWKEY, UPARROWKEY)) {
+ /* allow some keys - for frame changing: [#33412] */
+ }
+ else {
+ estate = OPERATOR_RUNNING_MODAL;
+ }
+ }
//printf("\tGP - handle modal event...\n");
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_select.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_select.c 2012-12-04 15:37:01 UTC (rev 52771)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_select.c 2012-12-04 17:38:55 UTC (rev 52772)
@@ -221,7 +221,7 @@
}
-/* object mode, EM_ prefix is confusing here, rename? */
+/* object mode, edbm_ prefix is confusing here, rename? */
static void edbm_backbuf_check_and_select_verts_obmode(Mesh *me, int select)
{
MVert *mv = me->mvert;
@@ -237,8 +237,8 @@
}
}
}
-/* object mode, EM_ prefix is confusing here, rename? */
+/* object mode, edbm_ prefix is confusing here, rename? */
static void edbm_backbuf_check_and_select_tfaces(Mesh *me, int select)
{
MPoly *mpoly = me->mpoly;
More information about the Bf-blender-cvs
mailing list