[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41824] trunk/blender/source/blender/ blenkernel/intern/dynamicpaint.c: Fix for [#29247] Incorrect black color with dynamic paint

[Miika Hamalainen]

Revision: 41824
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41824
Author:   miikah
Date:     2011-11-14 08:18:04 +0000 (Mon, 14 Nov 2011)
Log Message:
-----------
Fix for [#29247] Incorrect black color with dynamic paint

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c

Modified: trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c	2011-11-14 08:06:24 UTC (rev 41823)
+++ trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c	2011-11-14 08:18:04 UTC (rev 41824)
@@ -4139,13 +4139,13 @@
 				totalAlpha += ePoint->e_alpha;
 
 				/* do color mixing */
-				if (color_mix) mixColors(pPoint->e_color, pPoint->e_alpha, ePoint->e_color, color_mix);
+				if (color_mix > MIN_WETNESS) mixColors(pPoint->e_color, pPoint->e_alpha, ePoint->e_color, color_mix);
 
 				/* Check if neighbouring point has higher wetness,
 				*  if so, add it's wetness to this point as well*/
 				if (ePoint->wetness <= pPoint->wetness) continue;
 				w_factor = ePoint->wetness/numOfNeighs * (ePoint->wetness - pPoint->wetness) * speed_scale;
-				if (w_factor <= 0.0f) continue;
+				if (w_factor <= MIN_WETNESS) continue;
 
 				if (ePoint->e_alpha > pPoint->e_alpha) {
 					alphaAdd = ePoint->e_alpha/numOfNeighs * (ePoint->wetness*ePoint->e_alpha - pPoint->wetness*pPoint->e_alpha) * speed_scale;