diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-03-04 09:10:56 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-03-04 09:10:56 +0300 |
commit | 2df2f1c908fae86f4b29795384b8dabc192dc338 (patch) | |
tree | ee90b4974fef17c5612c242731ff0e10a430e7a3 | |
parent | abaa6c3ace14a25c3e47cc91b6da0e569cb06d1e (diff) |
Cleanup: use non-zero comparisons for event modifiers
Use event modifier checks that follow most of Blender's code.
-rw-r--r-- | source/blender/editors/gpencil/annotate_paint.c | 6 | ||||
-rw-r--r-- | source/blender/editors/gpencil/gpencil_paint.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/gpencil/annotate_paint.c b/source/blender/editors/gpencil/annotate_paint.c index c8bd38d58fe..e9817f82090 100644 --- a/source/blender/editors/gpencil/annotate_paint.c +++ b/source/blender/editors/gpencil/annotate_paint.c @@ -2093,7 +2093,7 @@ static void annotation_draw_apply_event( p->mval[1] = (float)event->mval[1] - y; /* Key to toggle stabilization. */ - if (event->shift > 0 && p->paintmode == GP_PAINTMODE_DRAW) { + if (event->shift && p->paintmode == GP_PAINTMODE_DRAW) { /* Using permanent stabilization, shift will deactivate the flag. */ if (p->flags & GP_PAINTFLAG_USE_STABILIZER) { if (p->flags & GP_PAINTFLAG_USE_STABILIZER_TEMP) { @@ -2108,7 +2108,7 @@ static void annotation_draw_apply_event( } } /* verify key status for straight lines */ - else if ((event->ctrl > 0) || (event->alt > 0)) { + else if (event->ctrl || event->alt) { if (p->straight[0] == 0) { int dx = abs((int)(p->mval[0] - p->mvalo[0])); int dy = abs((int)(p->mval[1] - p->mvalo[1])); @@ -2348,7 +2348,7 @@ static int annotation_draw_invoke(bContext *C, wmOperator *op, const wmEvent *ev p->flags |= GP_PAINTFLAG_USE_STABILIZER | GP_PAINTFLAG_USE_STABILIZER_TEMP; annotation_draw_toggle_stabilizer_cursor(p, true); } - else if (event->shift > 0) { + else if (event->shift) { p->flags |= GP_PAINTFLAG_USE_STABILIZER_TEMP; annotation_draw_toggle_stabilizer_cursor(p, true); } diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index 974f51ff90b..915cac6be77 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -2835,7 +2835,7 @@ static void gpencil_draw_apply_event(bContext *C, /* verify direction for straight lines and guides */ if ((is_speed_guide) || - ((event->alt > 0) && (RNA_boolean_get(op->ptr, "disable_straight") == false))) { + (event->alt && (RNA_boolean_get(op->ptr, "disable_straight") == false))) { if (p->straight == 0) { int dx = (int)fabsf(p->mval[0] - p->mvali[0]); int dy = (int)fabsf(p->mval[1] - p->mvali[1]); @@ -2876,13 +2876,13 @@ static void gpencil_draw_apply_event(bContext *C, /* special eraser modes */ if (p->paintmode == GP_PAINTMODE_ERASER) { - if (event->shift > 0) { + if (event->shift) { p->flags |= GP_PAINTFLAG_HARD_ERASER; } else { p->flags &= ~GP_PAINTFLAG_HARD_ERASER; } - if (event->alt > 0) { + if (event->alt) { p->flags |= GP_PAINTFLAG_STROKE_ERASER; } else { |