Revision: 58972
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58972
Author: psy-fi
Date: 2013-08-06 19:50:25 +0000 (Tue, 06 Aug 2013)
Log Message:
-----------
Fix secondary color not used in 2d painting for inverted strokes (ctrl-
Modified Paths:
--------------
branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_image_2d.c
Modified:
branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_image_2d.c
===================================================================
---
branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_image_2d.c
2013-08-06 19:02:29 UTC (rev 58971)
+++
branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_image_2d.c
2013-08-06 19:50:25 UTC (rev 58972)
@@ -379,7 +379,10 @@
/* get brush color */
if (brush->imagepaint_tool == PAINT_TOOL_DRAW) {
- copy_v3_v3(brush_rgb, brush->rgb);
+ if (painter->cache.invert_color)
+ copy_v3_v3(brush_rgb, brush->secondary_rgb);
+ else
+ copy_v3_v3(brush_rgb, brush->rgb);
if (use_color_correction)
srgb_to_linearrgb_v3_v3(brush_rgb, brush_rgb);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
