[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35080] trunk/blender/source/blender/ render/intern: Bugfix #25967

[Ton Roosendaal]

Revision: 35080
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35080
Author:   ton
Date:     2011-02-22 17:19:02 +0000 (Tue, 22 Feb 2011)
Log Message:
-----------
Bugfix #25967

Node Materials: option "Front/Back" in geometry node failed for
"full osa" case in ZTransp. 

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/include/shading.h
    trunk/blender/source/blender/render/intern/source/shadeinput.c
    trunk/blender/source/blender/render/intern/source/zbuf.c

Modified: trunk/blender/source/blender/render/intern/include/shading.h
===================================================================
--- trunk/blender/source/blender/render/intern/include/shading.h	2011-02-22 16:32:05 UTC (rev 35079)
+++ trunk/blender/source/blender/render/intern/include/shading.h	2011-02-22 17:19:02 UTC (rev 35080)
@@ -62,6 +62,7 @@
 void shade_input_set_viewco(struct ShadeInput *shi, float x, float y, float sx, float sy, float z);
 void shade_input_set_uv(struct ShadeInput *shi);
 void shade_input_set_normals(struct ShadeInput *shi);
+void shade_input_set_vertex_normals(struct ShadeInput *shi);
 void shade_input_flip_normals(struct ShadeInput *shi);
 void shade_input_set_shade_texco(struct ShadeInput *shi);
 void shade_input_set_strand(struct ShadeInput *shi, struct StrandRen *strand, struct StrandPoint *spoint);

Modified: trunk/blender/source/blender/render/intern/source/shadeinput.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/shadeinput.c	2011-02-22 16:32:05 UTC (rev 35079)
+++ trunk/blender/source/blender/render/intern/source/shadeinput.c	2011-02-22 17:19:02 UTC (rev 35080)
@@ -841,7 +841,7 @@
 }
 
 /* XXX shi->flippednor messes up otherwise */
-static void shade_input_set_vertex_normals(ShadeInput *shi)
+void shade_input_set_vertex_normals(ShadeInput *shi)
 {
 	float u= shi->u, v= shi->v;
 	float l= 1.0f+u+v;

Modified: trunk/blender/source/blender/render/intern/source/zbuf.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/zbuf.c	2011-02-22 16:32:05 UTC (rev 35079)
+++ trunk/blender/source/blender/render/intern/source/zbuf.c	2011-02-22 17:19:02 UTC (rev 35080)
@@ -3766,7 +3766,10 @@
 					shi->samplenr= R.shadowsamplenr[shi->thread]++;
 					shade_input_set_viewco(shi, x, y, xs, ys, (float)z);
 					shade_input_set_uv(shi);
-					shade_input_set_normals(shi);
+					if(shi_inc==0)
+						shade_input_set_normals(shi);
+					else /* XXX shi->flippednor messes up otherwise */
+						shade_input_set_vertex_normals(shi);
 					
 					shi_inc= 1;
 				}