diff options
| author | Miika Hamalainen <blender@miikah.org> | 2012-06-29 15:44:46 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2012-06-29 15:44:46 +0400 |
| commit | 6ddc574d9d13de243568c7d24260c71443a98217 (patch) | |
| tree | e95e187237c73f88e3d3e62997bdc45782285452 /source/blender/blenkernel/intern/effect.c | |
| parent | 3ad9e0f3ec522289b6ae13bd2a951b33d9ebfc4d (diff) | |
Fix #31953: Forcefield Texture using image file, gradient mode not working
Diffstat (limited to 'source/blender/blenkernel/intern/effect.c')
| -rw-r--r-- | source/blender/blenkernel/intern/effect.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c index b5254b97844..b32ac24084f 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/source/blender/blenkernel/intern/effect.c @@ -789,6 +789,12 @@ static void do_texture_effector(EffectorCache *eff, EffectorData *efd, EffectedP multitex_ext(eff->pd->tex, tex_co, NULL, NULL, 0, result+3); if (mode == PFIELD_TEX_GRAD || !hasrgb) { /* if we don't have rgb fall back to grad */ + /* generate intensity if texture only has rgb value */ + if (hasrgb & TEX_RGB) { + int i; + for (i=0; i<4; i++) + result[i].tin = (1.0f / 3.0f) * (result[i].tr + result[i].tg + result[i].tb); + } force[0] = (result[0].tin - result[1].tin) * strength; force[1] = (result[0].tin - result[2].tin) * strength; force[2] = (result[0].tin - result[3].tin) * strength; |