[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14087] trunk/blender/source/blender/ render/intern/source:

[Brecht Van Lommel]

Revision: 14087
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14087
Author:   blendix
Date:     2008-03-13 15:36:17 +0100 (Thu, 13 Mar 2008)

Log Message:
-----------

Fix for bake texture antialiasing commit, AO with constant jitter
didn't work. Also fixed a warning.

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

Modified: trunk/blender/source/blender/render/intern/source/rendercore.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/rendercore.c	2008-03-13 12:38:00 UTC (rev 14086)
+++ trunk/blender/source/blender/render/intern/source/rendercore.c	2008-03-13 14:36:17 UTC (rev 14087)
@@ -1896,6 +1896,8 @@
 		
 	/* cache for shadow */
 	shi->samplenr= R.shadowsamplenr[shi->thread]++;
+
+	shi->mask= 0xFFFF; /* all samples */
 	
 	shi->u= -u;
 	shi->v= -v;

Modified: trunk/blender/source/blender/render/intern/source/renderdatabase.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/renderdatabase.c	2008-03-13 12:38:00 UTC (rev 14086)
+++ trunk/blender/source/blender/render/intern/source/renderdatabase.c	2008-03-13 14:36:17 UTC (rev 14087)
@@ -441,8 +441,7 @@
 
 int RE_vlakren_get_normal(Render *re, ObjectInstanceRen *obi, VlakRen *vlr, float *nor)
 {
-	float xn, yn, zn, v1[3];
-	float (*nmat)[3]= obi->nmat;
+	float v1[3], (*nmat)[3]= obi->nmat;
 	int flipped= 0;
 
 	if(obi->flag & R_TRANSFORMED) {