Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2012-11-11 22:33:35 +0400
committerTon Roosendaal <ton@blender.org>2012-11-11 22:33:35 +0400
commit731e15be069d0d4231a93c3eb48b936f3b36179b (patch)
tree5ce2b604b100134f1ee5427ae792cc11235f870f /source/blender/editors/gpencil
parent6f32bece7faa16b9fbc5c794822c545c0ab51640 (diff)
Four fixes (own collection)
- Screencast: stops working on window resize - crashes movie file output - Screencast now draws simple brush overlay to indicate mouse cursor. - Greasepencil now works again to use MMB for view rotates (and missed proper redraw signal for toolbar, at end of paint)
Diffstat (limited to 'source/blender/editors/gpencil')
-rw-r--r--source/blender/editors/gpencil/gpencil_paint.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index fa681ae2f70..fcead283033 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -1800,7 +1800,7 @@ static void gpencil_stroke_end(wmOperator *op)
static int gpencil_draw_modal(bContext *C, wmOperator *op, wmEvent *event)
{
tGPsdata *p = op->customdata;
- int estate = OPERATOR_RUNNING_MODAL; /* default exit state - we don't pass on events, GP is used with key-modifiers */
+ int estate = OPERATOR_PASS_THROUGH; /* default exit state */
/* if (event->type == NDOF_MOTION)
* return OPERATOR_PASS_THROUGH;
@@ -1815,7 +1815,11 @@ static int gpencil_draw_modal(bContext *C, wmOperator *op, wmEvent *event)
* in 3D space.
*/
- /* printf("\tGP - handle modal event...\n"); */
+ /* 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;
+
+ //printf("\tGP - handle modal event...\n");
/* exit painting mode (and/or end current stroke)
* NOTE: cannot do RIGHTMOUSE (as is standard for cancelling) as that would break polyline [#32647]