diff options
Diffstat (limited to 'source/blender/editors/sculpt_paint/paint_cursor.c')
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_cursor.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_cursor.c b/source/blender/editors/sculpt_paint/paint_cursor.c index b44f2f66d92..c5e7b2dc4d3 100644 --- a/source/blender/editors/sculpt_paint/paint_cursor.c +++ b/source/blender/editors/sculpt_paint/paint_cursor.c @@ -545,6 +545,7 @@ static bool paint_draw_tex_overlay(UnifiedPaintSettings *ups, int x, int y, float zoom, + const ePaintMode mode, bool col, bool primary) { @@ -556,6 +557,13 @@ static bool paint_draw_tex_overlay(UnifiedPaintSettings *ups, (brush->overlay_flags & BRUSH_OVERLAY_SECONDARY) != 0); int overlay_alpha = (primary) ? brush->texture_overlay_alpha : brush->mask_overlay_alpha; + if (mode == PAINT_MODE_TEXTURE_3D) { + if (primary && brush->imagepaint_tool == PAINT_TOOL_DRAW) { + /* All non-draw tools don't use the primary texture (clone, smear, soften.. etc). */ + return false; + } + } + if (!(mtex->tex) || !((mtex->brush_map_mode == MTEX_MAP_MODE_STENCIL) || (valid && ELEM(mtex->brush_map_mode, MTEX_MAP_MODE_VIEW, MTEX_MAP_MODE_TILED)))) { @@ -785,10 +793,11 @@ static bool paint_draw_alpha_overlay(UnifiedPaintSettings *ups, /* Colored overlay should be drawn separately. */ if (col) { if (!(flags & PAINT_OVERLAY_OVERRIDE_PRIMARY)) { - alpha_overlay_active = paint_draw_tex_overlay(ups, brush, vc, x, y, zoom, true, true); + alpha_overlay_active = paint_draw_tex_overlay(ups, brush, vc, x, y, zoom, mode, true, true); } if (!(flags & PAINT_OVERLAY_OVERRIDE_SECONDARY)) { - alpha_overlay_active = paint_draw_tex_overlay(ups, brush, vc, x, y, zoom, false, false); + alpha_overlay_active = paint_draw_tex_overlay( + ups, brush, vc, x, y, zoom, mode, false, false); } if (!(flags & PAINT_OVERLAY_OVERRIDE_CURSOR)) { alpha_overlay_active = paint_draw_cursor_overlay(ups, brush, vc, x, y, zoom); @@ -796,7 +805,7 @@ static bool paint_draw_alpha_overlay(UnifiedPaintSettings *ups, } else { if (!(flags & PAINT_OVERLAY_OVERRIDE_PRIMARY) && (mode != PAINT_MODE_WEIGHT)) { - alpha_overlay_active = paint_draw_tex_overlay(ups, brush, vc, x, y, zoom, false, true); + alpha_overlay_active = paint_draw_tex_overlay(ups, brush, vc, x, y, zoom, mode, false, true); } if (!(flags & PAINT_OVERLAY_OVERRIDE_CURSOR)) { alpha_overlay_active = paint_draw_cursor_overlay(ups, brush, vc, x, y, zoom); |