diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2013-03-31 15:04:13 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2013-03-31 15:04:13 +0400 |
| commit | 514c449a549662a29507f3a3d1eaabd7e216ea94 (patch) | |
| tree | 69dc0385a50584fb78bfb4a86ee19ad77e97b049 /source/blender/editors | |
| parent | e8d532f1dde96c40c1407d39260724fcfee0b606 (diff) | |
UI cleanup:
* Using masking is determined only by the presence of the texture,
remove extraneous DNA flag (might cause issues later but in practice
brush options are not harmful)
* Overlay and angle sliders are active during stencil mapped brushes
* Only draw the overlay if there's a texture.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_cursor.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_image_proj.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_cursor.c b/source/blender/editors/sculpt_paint/paint_cursor.c index dd07da6a16f..80cce81e152 100644 --- a/source/blender/editors/sculpt_paint/paint_cursor.c +++ b/source/blender/editors/sculpt_paint/paint_cursor.c @@ -424,9 +424,9 @@ static void paint_draw_alpha_overlay(UnifiedPaintSettings *ups, Brush *brush, bool col; /* check for overlay mode */ - if (brush->mtex.brush_map_mode != MTEX_MAP_MODE_STENCIL && - (!(brush->flag & BRUSH_TEXTURE_OVERLAY) || - !ELEM(brush->mtex.brush_map_mode, MTEX_MAP_MODE_VIEW, MTEX_MAP_MODE_TILED))) + if (!((brush->mtex.brush_map_mode == MTEX_MAP_MODE_STENCIL && brush->mtex.tex) || + ((brush->flag & BRUSH_TEXTURE_OVERLAY) && + ELEM(brush->mtex.brush_map_mode, MTEX_MAP_MODE_VIEW, MTEX_MAP_MODE_TILED)))) { return; } diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index 5dcfa181fa2..a2101305b4b 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -4160,7 +4160,7 @@ static void project_state_init(bContext *C, Object *ob, ProjPaintState *ps, int /* disable for 3d mapping also because painting on mirrored mesh can create "stripes" */ ps->do_masking = (brush->flag & BRUSH_AIRBRUSH || brush->mtex.brush_map_mode != MTEX_MAP_MODE_TILED) ? false : true; ps->is_texbrush = (brush->mtex.tex && brush->imagepaint_tool == PAINT_TOOL_DRAW) ? true : false; - ps->is_maskbrush = (brush->flag & BRUSH_USE_MASK && brush->mask_mtex.tex) ? true : false; + ps->is_maskbrush = (brush->mask_mtex.tex) ? true : false; } else { /* brush may be NULL*/ |