[Bf-blender-cvs] [f1a0c2a] master: Fix T43941: Grease pencil eraser outline vanishes
Campbell Barton
noreply at git.blender.org
Tue Mar 10 08:29:32 CET 2015
Commit: f1a0c2a4f025ce26aabab055ce04aecf34bf90ea
Author: Campbell Barton
Date: Tue Mar 10 18:17:02 2015 +1100
Branches: master
https://developer.blender.org/rBf1a0c2a4f025ce26aabab055ce04aecf34bf90ea
Fix T43941: Grease pencil eraser outline vanishes
===================================================================
M source/blender/editors/gpencil/gpencil_paint.c
===================================================================
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index 38a7ffa..c8774cb 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -1942,18 +1942,15 @@ static int gpencil_draw_modal(bContext *C, wmOperator *op, const wmEvent *event)
*/
if (event->type == LEFTMOUSE) {
/* restore drawmode to default */
- // XXX: no need for this... this should just revert by itself
- if (p->paintmode == GP_PAINTMODE_ERASER)
- gpencil_draw_toggle_eraser_cursor(C, p, false);
-
p->paintmode = RNA_enum_get(op->ptr, "mode");
}
else if (event->type == RIGHTMOUSE) {
/* turn on eraser */
p->paintmode = GP_PAINTMODE_ERASER;
- gpencil_draw_toggle_eraser_cursor(C, p, true);
}
-
+
+ gpencil_draw_toggle_eraser_cursor(C, p, p->paintmode == GP_PAINTMODE_ERASER);
+
/* not painting, so start stroke (this should be mouse-button down) */
p = gpencil_stroke_begin(C, op);
More information about the Bf-blender-cvs
mailing list