diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2013-04-23 00:46:18 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2013-04-23 00:46:18 +0400 |
| commit | 36e476ede6dae4cc21e1d9a05b7e9b93d52f70d1 (patch) | |
| tree | 2275ccfce9f899f26243915e7d602caf40b36ca4 /source/blender/blenkernel/intern/paint.c | |
| parent | 3c67cf9594264d8c4fc44f8f15e4033aa9b0e92d (diff) | |
Overlay refactor:
Allow separate control for tex/mask/cursor overlay. This commit implements
separate overlays for mask textures and cursor curves. The user can turn on
and off separate parts of the overlay by using the appropriate widgets.
The cursor overlay widgets are located at the tool selection panel
Also fixed alpha masks not getting correctly masked and mask texture mapping
not having the correct update callback
Diffstat (limited to 'source/blender/blenkernel/intern/paint.c')
| -rw-r--r-- | source/blender/blenkernel/intern/paint.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index 59bfb987a19..ef751d130db 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -108,11 +108,9 @@ bool BKE_paint_get_overlay_override(void) } -void BKE_paint_reset_overlay_invalid(void) +void BKE_paint_reset_overlay_invalid(OverlayControlFlags flag) { - overlay_flags &= ~(PAINT_INVALID_OVERLAY_TEXTURE_PRIMARY | - PAINT_INVALID_OVERLAY_TEXTURE_SECONDARY | - PAINT_INVALID_OVERLAY_CURVE); + overlay_flags &= ~(flag); } |