diff options
Diffstat (limited to 'source/blender/blenkernel/intern')
| -rw-r--r-- | source/blender/blenkernel/intern/brush.c | 4 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/paint.c | 23 |
2 files changed, 15 insertions, 12 deletions
diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c index e52d1d3b683..e3709143277 100644 --- a/source/blender/blenkernel/intern/brush.c +++ b/source/blender/blenkernel/intern/brush.c @@ -320,7 +320,9 @@ void BKE_brush_debug_print_state(Brush *br) BR_TEST_FLAG_OVERLAY(BRUSH_OVERLAY_CURSOR); BR_TEST_FLAG_OVERLAY(BRUSH_OVERLAY_PRIMARY); BR_TEST_FLAG_OVERLAY(BRUSH_OVERLAY_SECONDARY); - BR_TEST_FLAG_OVERLAY(BRUSH_OVERLAY_OVERRIDE_ON_STROKE); + BR_TEST_FLAG_OVERLAY(BRUSH_OVERLAY_CURSOR_OVERRIDE_ON_STROKE); + BR_TEST_FLAG_OVERLAY(BRUSH_OVERLAY_PRIMARY_OVERRIDE_ON_STROKE); + BR_TEST_FLAG_OVERLAY(BRUSH_OVERLAY_SECONDARY_OVERRIDE_ON_STROKE); BR_TEST(jitter, f); BR_TEST(spacing, d); diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index ef751d130db..3912a79e703 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -94,20 +94,21 @@ OverlayControlFlags BKE_paint_get_overlay_flags(void) return overlay_flags; } -void BKE_paint_set_overlay_override(bool flag) +void BKE_paint_set_overlay_override(OverlayFlags flags) { - if (flag) - overlay_flags |= PAINT_OVERLAY_OVERRIDE; - else - overlay_flags &= ~PAINT_OVERLAY_OVERRIDE; -} - -bool BKE_paint_get_overlay_override(void) -{ - return ((overlay_flags & PAINT_OVERLAY_OVERRIDE) != 0 ); + if (flags & BRUSH_OVERLAY_OVERRIDE_MASK) { + if (flags & BRUSH_OVERLAY_CURSOR_OVERRIDE_ON_STROKE) + overlay_flags |= PAINT_OVERLAY_OVERRIDE_CURSOR; + if (flags & BRUSH_OVERLAY_PRIMARY_OVERRIDE_ON_STROKE) + overlay_flags |= PAINT_OVERLAY_OVERRIDE_PRIMARY; + if (flags & BRUSH_OVERLAY_SECONDARY_OVERRIDE_ON_STROKE) + overlay_flags |= PAINT_OVERLAY_OVERRIDE_SECONDARY; + } + else { + overlay_flags &= ~(PAINT_OVERRIDE_MASK); + } } - void BKE_paint_reset_overlay_invalid(OverlayControlFlags flag) { overlay_flags &= ~(flag); |