[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13299] trunk/blender/source/blender/ render/intern/source/occlusion.c:

[Brecht Van Lommel]

Revision: 13299
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13299
Author:   blendix
Date:     2008-01-19 20:33:32 +0100 (Sat, 19 Jan 2008)

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

Bugfix for crash in approximate AO pixel cache.

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

Modified: trunk/blender/source/blender/render/intern/source/occlusion.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/occlusion.c	2008-01-19 19:01:19 UTC (rev 13298)
+++ trunk/blender/source/blender/render/intern/source/occlusion.c	2008-01-19 19:33:32 UTC (rev 13299)
@@ -1641,7 +1641,7 @@
 
 	/* compute a sample at every step pixels */
 	for(y=pa->disprect.ymin; y<pa->disprect.ymax; y++) {
-		for(x=pa->disprect.xmin; x<pa->disprect.xmax; x++, ro++, rp++, rz++) {
+		for(x=pa->disprect.xmin; x<pa->disprect.xmax; x++, ro++, rp++, rz++, sample++) {
 			if((((x - pa->disprect.xmin + step) % step) == 0 || x == pa->disprect.xmax-1) && (((y - pa->disprect.ymin + step) % step) == 0 || y == pa->disprect.ymax-1)) {
 				if(*rp) {
 					ps.obi= *ro;
@@ -1650,6 +1650,8 @@
 
 					shade_samples_fill_with_ps(ssamp, &ps, x, y);
 					shi= ssamp->shi;
+					if(!shi->vlr)
+						continue;
 
 					onlyshadow= (shi->mat->mode & MA_ONLYSHADOW);
 					exclude.obi= shi->obi - re->objectinstance;
@@ -1669,8 +1671,6 @@
 				if(re->test_break())
 					break;
 			}
-
-			sample++;
 		}
 	}
 }