Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix [#33412] Jump to next frame broken in grease pencil mode

Browse Source 
allow arrow keys while in grease pencil session, otherwise you can't change frames.

also correct out-of-date comments.
This commit is contained in:
Campbell Barton
2012-12-04 17:38:55 +00:00
parent 576bc2e6e4
commit 677c712b58
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/editors/gpencil/gpencil_paint.c
View File

@@ -1815,10 +1815,16 @@ static int gpencil_draw_modal(bContext *C, wmOperator *op, wmEvent *event)
* better in tools that immediately apply * better in tools that immediately apply
* in 3D space. * in 3D space.
*/ */
/* we don't pass on key events, GP is used with key-modifiers - prevents Dkey to insert drivers */ /* we don't pass on key events, GP is used with key-modifiers - prevents Dkey to insert drivers */
if (ISKEYBOARD(event->type)) if (ISKEYBOARD(event->type)) {
estate = OPERATOR_RUNNING_MODAL; 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"); //printf("\tGP - handle modal event...\n");

4
source/blender/editors/space_view3d/view3d_select.c
View File

@@ -221,7 +221,7 @@ static void edbm_backbuf_check_and_select_faces(BMEditMesh *em, int select)
} }
/* 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) static void edbm_backbuf_check_and_select_verts_obmode(Mesh *me, int select)
{ {
MVert *mv = me->mvert; MVert *mv = me->mvert;
@@ -237,8 +237,8 @@ static void edbm_backbuf_check_and_select_verts_obmode(Mesh *me, int select)
} }
} }
} }
/* 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) static void edbm_backbuf_check_and_select_tfaces(Mesh *me, int select)
{ {
MPoly *mpoly = me->mpoly; MPoly *mpoly = me->mpoly;