diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-02-19 14:37:35 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-02-19 14:37:47 +0300 |
| commit | ebdc1cde3feea7969448cf1817a1e01d0f4709a2 (patch) | |
| tree | 6772d8d0d4bcf27d5ce0f167d4ac098d80815b40 /source/blender/editors/sculpt_paint/paint_image_2d.c | |
| parent | 528514c3938429e99dc59d756cbcc46a7c6d8dce (diff) | |
Fix 2d paint issue with textured brushes: Multiply brush color with
texture in the right space
Diffstat (limited to 'source/blender/editors/sculpt_paint/paint_image_2d.c')
| -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 95940d89694..b0fd6a9fa6b 100644 --- a/source/blender/editors/sculpt_paint/paint_image_2d.c +++ b/source/blender/editors/sculpt_paint/paint_image_2d.c @@ -408,11 +408,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); @@ -482,11 +482,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); |