Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Riakiotakis <kalast@gmail.com>2013-04-23 04:32:51 +0400
committerAntony Riakiotakis <kalast@gmail.com>2013-04-23 04:32:51 +0400
commit51010f50351a5115122dc64e02a5a9b2c76c4edb (patch)
tree4a6fab70dd88d012f14ccf003a7c7aaef4e42e52 /source/blender/blenkernel/intern/paint.c
parent157244b13cf61d5889f5714167c6e5468ae35b15 (diff)
Allow hiding separate hiding of overlays on stroke.
Diffstat (limited to 'source/blender/blenkernel/intern/paint.c')
-rw-r--r--source/blender/blenkernel/intern/paint.c23
1 files changed, 12 insertions, 11 deletions
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);