diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-08-16 18:11:58 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-08-16 18:11:58 +0400 |
| commit | 23807d1fb43de44ca7c4db5dc7bd92178f4b6a14 (patch) | |
| tree | 6d2e17c8405789363e69df000cf14207110428b2 /source/blender/editors/gpencil/gpencil_paint.c | |
| parent | 02d2472baacd8ac091a29392a2bc9ac8693fb5e7 (diff) | |
| parent | dddfb5e1738830c325e796a474d0ea14d64654f3 (diff) | |
Merging trunk up to r39447.
Diffstat (limited to 'source/blender/editors/gpencil/gpencil_paint.c')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_paint.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index ffe2e334772..04565eab155 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -1613,7 +1613,12 @@ static int gpencil_area_exists(bContext *C, ScrArea *satest) static int gpencil_draw_modal (bContext *C, wmOperator *op, wmEvent *event) { tGPsdata *p= op->customdata; - int estate = OPERATOR_PASS_THROUGH; /* default exit state - not handled, so let others have a share of the pie */ + //int estate = OPERATOR_PASS_THROUGH; /* default exit state - not handled, so let others have a share of the pie */ + /* currently, grease pencil conflicts with such operators as undo and set object mode + which makes behavior of operator totally unpredictable and crash for some cases. + the only way to solve this proper is to ger rid of pointers to data which can + chage stored in operator custom data (sergey) */ + int estate = OPERATOR_RUNNING_MODAL; // if (event->type == NDOF_MOTION) // return OPERATOR_PASS_THROUGH; |