diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2019-03-08 17:53:38 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2019-03-11 16:36:22 +0300 |
| commit | 4302342287b56e6b47930eec7db55625c3589327 (patch) | |
| tree | 3be6e6b6096f39018c33f1e58bad76237018abd8 /source/blender/editors/sculpt_paint/paint_image_proj.c | |
| parent | f60896454929080ae775a7143c30722788ab83df (diff) | |
Fix T62359: Flip colors for Fill Tool missing
Reviewers: brecht
Maniphest Tasks: T62359
Differential Revision: https://developer.blender.org/D4486
Diffstat (limited to 'source/blender/editors/sculpt_paint/paint_image_proj.c')
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_image_proj.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index f8a2259d4a5..d712d0671f8 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -5367,7 +5367,7 @@ static void paint_proj_stroke_ps( ps->blend = IMB_BLEND_ERASE_ALPHA; /* handle gradient and inverted stroke color here */ - if (ps->tool == PAINT_TOOL_DRAW) { + if (ELEM(ps->tool, PAINT_TOOL_DRAW, PAINT_TOOL_FILL)) { paint_brush_color_get(scene, brush, false, ps->mode == BRUSH_STROKE_INVERT, distance, pressure, ps->paint_color, NULL); if (ps->use_colormanagement) { srgb_to_linearrgb_v3_v3(ps->paint_color_linear, ps->paint_color); @@ -5376,15 +5376,6 @@ static void paint_proj_stroke_ps( copy_v3_v3(ps->paint_color_linear, ps->paint_color); } } - else if (ps->tool == PAINT_TOOL_FILL) { - copy_v3_v3(ps->paint_color, BKE_brush_color_get(scene, brush)); - if (ps->use_colormanagement) { - srgb_to_linearrgb_v3_v3(ps->paint_color_linear, ps->paint_color); - } - else { - copy_v3_v3(ps->paint_color_linear, ps->paint_color); - } - } else if (ps->tool == PAINT_TOOL_MASK) { ps->stencil_value = brush->weight; |