diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-09-05 17:46:10 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-09-05 17:48:45 +0400 |
| commit | 91006d5a7a77f3bfac56993e81916ead052ca828 (patch) | |
| tree | 626fb89e4afdcdd657f04defdd0d2e1d417924f9 | |
| parent | 5a8644bd97341136b01dea4afdefe4e0929bbc3d (diff) | |
Fix T41723, different tints in texture painting.
Blend brush color with texture before converting to srgb
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_image_2d.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_image_2d.c b/source/blender/editors/sculpt_paint/paint_image_2d.c index 5607dce8d54..165888b3c09 100644 --- a/source/blender/editors/sculpt_paint/paint_image_2d.c +++ b/source/blender/editors/sculpt_paint/paint_image_2d.c @@ -411,11 +411,11 @@ static ImBuf *brush_painter_imbuf_new(BrushPainter *painter, int size, float pre if (is_texbrush) { brush_imbuf_tex_co(&tex_mapping, x, y, texco); BKE_brush_sample_tex_3D(scene, brush, texco, rgba, thread, pool); + mul_v3_v3(rgba, brush_rgb); /* TODO(sergey): Support texture paint color space. */ if (!use_float) { IMB_colormanagement_scene_linear_to_display_v3(rgba, display); } - mul_v3_v3(rgba, brush_rgb); } else { copy_v3_v3(rgba, brush_rgb); @@ -485,11 +485,11 @@ static void brush_painter_imbuf_update(BrushPainter *painter, ImBuf *oldtexibuf, if (is_texbrush) { brush_imbuf_tex_co(&tex_mapping, x, y, texco); BKE_brush_sample_tex_3D(scene, brush, texco, rgba, thread, pool); + mul_v3_v3(rgba, brush_rgb); /* TODO(sergey): Support texture paint color space. */ if (!use_float) { IMB_colormanagement_scene_linear_to_display_v3(rgba, display); } - mul_v3_v3(rgba, brush_rgb); } else { copy_v3_v3(rgba, brush_rgb); |