[Bf-blender-cvs] [ba4d920ab56] blender2.8: Fix Alt key conflict in Annotation Eraser
Antonioya
noreply at git.blender.org
Fri Nov 30 10:58:49 CET 2018
Commit: ba4d920ab56766f858eb0c5ebc611696f9f233a1
Author: Antonioya
Date: Fri Nov 30 10:58:12 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBba4d920ab56766f858eb0c5ebc611696f9f233a1
Fix Alt key conflict in Annotation Eraser
There was a conflict when the Alt key was pressed while drawing and this makes eraser very difficult.
===================================================================
M source/blender/editors/gpencil/annotate_paint.c
===================================================================
diff --git a/source/blender/editors/gpencil/annotate_paint.c b/source/blender/editors/gpencil/annotate_paint.c
index 7cfe066e68b..c7e6bb844c0 100644
--- a/source/blender/editors/gpencil/annotate_paint.c
+++ b/source/blender/editors/gpencil/annotate_paint.c
@@ -1759,7 +1759,7 @@ static void gpencil_draw_apply_event(wmOperator *op, const wmEvent *event, Depsg
}
/* check if alt key is pressed and limit to straight lines */
- if (p->straight[0] != 0) {
+ if ((p->paintmode != GP_PAINTMODE_ERASER) && (p->straight[0] != 0)) {
if (p->straight[0] == 1) {
/* horizontal */
p->mval[1] = p->straight[1]; /* replace y */
More information about the Bf-blender-cvs
mailing list