diff options
| author | Miika Hamalainen <blender@miikah.org> | 2011-11-14 12:18:04 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2011-11-14 12:18:04 +0400 |
| commit | 5a01ec56da296ae211acb4e1be1e1d03f042cb82 (patch) | |
| tree | effe2cd47c9c74b3f8ba826eb39b8cc34a980e39 /source/blender/blenkernel/intern/dynamicpaint.c | |
| parent | ad943db0e334e2e465a434854b6cd71344b63299 (diff) | |
Fix for [#29247] Incorrect black color with dynamic paint
Diffstat (limited to 'source/blender/blenkernel/intern/dynamicpaint.c')
| -rw-r--r-- | source/blender/blenkernel/intern/dynamicpaint.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index 5066b558c5a..13eb59695b9 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -4139,13 +4139,13 @@ static void dynamicPaint_doEffectStep(DynamicPaintSurface *surface, float *force 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; |