[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39725] trunk/blender/source/blender/ render/intern/source/render_texture.c: bugfix for procedural textures used as bumpmap with osa not rendering right , also remove redundant assignment.

[Campbell Barton]

Revision: 39725
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39725
Author:   campbellbarton
Date:     2011-08-27 02:04:29 +0000 (Sat, 27 Aug 2011)
Log Message:
-----------
bugfix for procedural textures used as bumpmap with osa not rendering right, also remove redundant assignment.

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/render_texture.c

Modified: trunk/blender/source/blender/render/intern/source/render_texture.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/render_texture.c	2011-08-27 01:42:49 UTC (rev 39724)
+++ trunk/blender/source/blender/render/intern/source/render_texture.c	2011-08-27 02:04:29 UTC (rev 39725)
@@ -1789,7 +1789,7 @@
 			const float adx[3] = {fabsf(dx[0]), fabsf(dx[1]), fabsf(dx[2])};
 			const float ady[3] = {fabsf(dy[0]), fabsf(dy[1]), fabsf(dy[2])};
 			du = MAX3(adx[0], adx[1], adx[2]);
-			dv = MAX3(ady[1], ady[1], ady[2]);
+			dv = MAX3(ady[0], ady[1], ady[2]);
 		}
 	}
 
@@ -2358,7 +2358,6 @@
 						f1= shi->vn[0];
 						f2= shi->vn[1];
 						texres.nor[0]= f1*co_nor+f2*si;
-						texres.nor[1]= f2*co_nor-f1*si;
 						f1= shi->vn[1];
 						f2= shi->vn[2];
 						texres.nor[1]= f1*co_nor+f2*si;