[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28421] trunk/blender/source/blender/ blenkernel/intern: Fix [#22160] blender 2.5 alpha2 can't open file grass. blend from blenderguru

[Matt Ebb]

Revision: 28421
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28421
Author:   broken
Date:     2010-04-26 04:23:13 +0200 (Mon, 26 Apr 2010)

Log Message:
-----------
Fix  [#22160] blender 2.5 alpha2 can't open file grass.blend from blenderguru

Textures were being called with multitex_ext with osatex enabled, but NULL derivates.
Fixed this for texture effectors and a couple of other places.

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

Modified: trunk/blender/source/blender/blenkernel/intern/brush.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/brush.c	2010-04-25 23:33:09 UTC (rev 28420)
+++ trunk/blender/source/blender/blenkernel/intern/brush.c	2010-04-26 02:23:13 UTC (rev 28421)
@@ -930,7 +930,7 @@
 				co[2]= 0.0f;
 				
 				/* This is copied from displace modifier code */
-				hasrgb = multitex_ext(mtex->tex, co, NULL, NULL, 1, &texres);
+				hasrgb = multitex_ext(mtex->tex, co, NULL, NULL, 0, &texres);
 			
 				/* if the texture gave an RGB value, we assume it didn't give a valid
 				 * intensity, so calculate one (formula from do_material_tex).

Modified: trunk/blender/source/blender/blenkernel/intern/effect.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/effect.c	2010-04-25 23:33:09 UTC (rev 28420)
+++ trunk/blender/source/blender/blenkernel/intern/effect.c	2010-04-26 02:23:13 UTC (rev 28421)
@@ -780,7 +780,7 @@
 		mul_mat3_m4_v3(eff->ob->obmat, tex_co);
 	}
 
-	hasrgb = multitex_ext(eff->pd->tex, tex_co, NULL,NULL, 1, result);
+	hasrgb = multitex_ext(eff->pd->tex, tex_co, NULL,NULL, 0, result);
 
 	if(hasrgb && mode==PFIELD_TEX_RGB) {
 		force[0] = (0.5f - result->tr) * strength;
@@ -791,15 +791,15 @@
 		strength/=nabla;
 
 		tex_co[0] += nabla;
-		multitex_ext(eff->pd->tex, tex_co, NULL, NULL, 1, result+1);
+		multitex_ext(eff->pd->tex, tex_co, NULL, NULL, 0, result+1);
 
 		tex_co[0] -= nabla;
 		tex_co[1] += nabla;
-		multitex_ext(eff->pd->tex, tex_co, NULL, NULL, 1, result+2);
+		multitex_ext(eff->pd->tex, tex_co, NULL, NULL, 0, result+2);
 
 		tex_co[1] -= nabla;
 		tex_co[2] += nabla;
-		multitex_ext(eff->pd->tex, tex_co, NULL, NULL, 1, result+3);
+		multitex_ext(eff->pd->tex, tex_co, NULL, NULL, 0, result+3);
 
 		if(mode == PFIELD_TEX_GRAD || !hasrgb) { /* if we dont have rgb fall back to grad */
 			force[0] = (result[0].tin - result[1].tin) * strength;