[Bf-blender-cvs] [d1cf350] master: Fix double promotion to scene linear in 2s painting.

[Antony Riakiotakis]

Commit: d1cf35069dd7baa2f655092875ec36a55cfcc501
Author: Antony Riakiotakis
Date:   Fri May 9 00:12:18 2014 +0300
https://developer.blender.org/rBd1cf35069dd7baa2f655092875ec36a55cfcc501

Fix double promotion to scene linear in 2s painting.

===================================================================

M	source/blender/editors/sculpt_paint/paint_image_2d.c

===================================================================

diff --git a/source/blender/editors/sculpt_paint/paint_image_2d.c b/source/blender/editors/sculpt_paint/paint_image_2d.c
index 7888b15..16dacae 100644
--- a/source/blender/editors/sculpt_paint/paint_image_2d.c
+++ b/source/blender/editors/sculpt_paint/paint_image_2d.c
@@ -280,7 +280,7 @@ static ImBuf *brush_painter_imbuf_new(BrushPainter *painter, int size)
 				BKE_brush_sample_tex_3D(scene, brush, texco, rgba, thread, pool);
 				/* TODO(sergey): Support texture paint color space. */
 				if (!use_float) {
-					IMB_colormanagement_display_to_scene_linear_v3(rgba, display);
+					IMB_colormanagement_scene_linear_to_display_v3(rgba, display);
 				}
 				mul_v3_v3(rgba, brush_rgb);
 			}
@@ -375,7 +375,7 @@ static void brush_painter_imbuf_update(BrushPainter *painter, ImBuf *oldtexibuf,
 					BKE_brush_sample_tex_3D(scene, brush, texco, rgba, thread, pool);
 					/* TODO(sergey): Support texture paint color space. */
 					if (!use_float) {
-						IMB_colormanagement_display_to_scene_linear_v3(rgba, display);
+						IMB_colormanagement_scene_linear_to_display_v3(rgba, display);
 					}
 					mul_v3_v3(rgba, brush_rgb);
 				}