diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-15 13:16:39 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-15 13:16:39 +0400 |
| commit | 917714acf72340bbea363c81773887c6c532c7d8 (patch) | |
| tree | f987aa296bb053949b2dbecf7931f4a73dc3a2db /source/blender/blenkernel/intern/dynamicpaint.c | |
| parent | 3bb9c4adf985aff5e8e213807f3db0d7cd7556e7 (diff) | |
| parent | 5c93135ef9a1e7265ead3b92b10ea9a4ef82b909 (diff) | |
svn merge ^/trunk/blender -r43345:43381
Diffstat (limited to 'source/blender/blenkernel/intern/dynamicpaint.c')
| -rw-r--r-- | source/blender/blenkernel/intern/dynamicpaint.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index 54684bc4f66..b7acede4b7b 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -1624,8 +1624,8 @@ static struct DerivedMesh *dynamicPaint_Modifier_apply(DynamicPaintModifierData } else { col[l_index].a = 255; - col[l_index].r = FTOCHAR(pPoint[v_index].wetness); - col[l_index].g = FTOCHAR(pPoint[v_index].wetness); + col[l_index].r = + col[l_index].g = col[l_index].b = FTOCHAR(pPoint[v_index].wetness); } } @@ -1667,8 +1667,8 @@ static struct DerivedMesh *dynamicPaint_Modifier_apply(DynamicPaintModifierData for (i=0; i<totloop; i++) { int index = mloop[i].v; col[i].a = 255; - col[i].r = FTOCHAR(pPoint[index].wetness); - col[i].g = FTOCHAR(pPoint[index].wetness); + col[i].r = + col[i].g = col[i].b = FTOCHAR(pPoint[index].wetness); } } |