diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-04-21 17:11:51 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-04-21 17:11:51 +0400 |
| commit | 210ee1ade4b4ec5b6f2d3710986171a21a4b8604 (patch) | |
| tree | 86e27af39ba932f043da2b73463651ff2e40d41c /source/blender/blenkernel/intern/material.c | |
| parent | 2e9982f420cab3b2ecf4648c0a91403f757ef9fe (diff) | |
whitespace only, no functional change mixed tabs/spaces --> tabs.v2.57a
Diffstat (limited to 'source/blender/blenkernel/intern/material.c')
| -rw-r--r-- | source/blender/blenkernel/intern/material.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index fa7709e3b33..130bc798ff1 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -1314,12 +1314,12 @@ void ramp_blend(int type, float *r, float *g, float *b, float fac, float *col) case MA_RAMP_SOFT: if (g){ float scr, scg, scb; - + /* first calculate non-fac based Screen mix */ scr = 1.0f - (1.0f - col[0]) * (1.0f - *r); scg = 1.0f - (1.0f - col[1]) * (1.0f - *g); scb = 1.0f - (1.0f - col[2]) * (1.0f - *b); - + *r = facm*(*r) + fac*(((1.0f - *r) * col[0] * (*r)) + (*r * scr)); *g = facm*(*g) + fac*(((1.0f - *g) * col[1] * (*g)) + (*g * scg)); *b = facm*(*b) + fac*(((1.0f - *b) * col[2] * (*b)) + (*b * scb)); |