[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48404] trunk/blender/source/blender/ blenkernel/intern/effect.c: Fix #31953: Forcefield Texture using image file , gradient mode not working

[Miika Hamalainen]

Revision: 48404
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48404
Author:   miikah
Date:     2012-06-29 11:44:46 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
Fix #31953: Forcefield Texture using image file, gradient mode not working

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

Modified: trunk/blender/source/blender/blenkernel/intern/effect.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/effect.c	2012-06-29 11:42:57 UTC (rev 48403)
+++ trunk/blender/source/blender/blenkernel/intern/effect.c	2012-06-29 11:44:46 UTC (rev 48404)
@@ -789,6 +789,12 @@
 		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;