[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13918] trunk/blender/source/blender:

[Brecht Van Lommel]

Revision: 13918
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13918
Author:   blendix
Date:     2008-02-29 17:52:46 +0100 (Fri, 29 Feb 2008)

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

Fix for bug #8403: a radiosity render crash.

Modified Paths:
--------------
    trunk/blender/source/blender/radiosity/intern/source/radrender.c
    trunk/blender/source/blender/render/intern/source/zbuf.c

Modified: trunk/blender/source/blender/radiosity/intern/source/radrender.c
===================================================================
--- trunk/blender/source/blender/radiosity/intern/source/radrender.c	2008-02-29 15:50:28 UTC (rev 13917)
+++ trunk/blender/source/blender/radiosity/intern/source/radrender.c	2008-02-29 16:52:46 UTC (rev 13918)
@@ -99,7 +99,7 @@
 	for(obr=re->objecttable.first; obr; obr=obr->next) {
 		for(a=0; a<obr->totvlak; a++) {
 			if((a & 255)==0) vlr= obr->vlaknodes[a>>8].vlak; else vlr++;
-			if((radface=RE_vlakren_get_radface(obr, vlr, 0))) {
+			if((radface=RE_vlakren_get_radface(obr, vlr, 0)) && *radface) {
 				rf= *radface;
 				rf->flag &= ~RAD_SHOOT;
 				
@@ -141,7 +141,7 @@
 	for(obr=re->objecttable.first; obr; obr=obr->next) {
 		for(a=0; a<obr->totvlak; a++) {
 			if((a & 255)==0) vlr= obr->vlaknodes[a>>8].vlak; else vlr++;
-			if(vlr != shoot && (radface=RE_vlakren_get_radface(obr, vlr, 0))) {
+			if(vlr != shoot && (radface=RE_vlakren_get_radface(obr, vlr, 0)) && *radface) {
 				rf= *radface;
 				VecSubf(tvec, shootrf->cent, rf->cent);
 				
@@ -164,7 +164,7 @@
 		for(a=0; a<obr->totvlak; a++) {
 			if((a & 255)==0) vlr= obr->vlaknodes[a>>8].vlak; else vlr++;
 			
-			if((radface=RE_vlakren_get_radface(obr, vlr, 0))) {
+			if((radface=RE_vlakren_get_radface(obr, vlr, 0)) && *radface) {
 				rf= *radface;
 				rf->flag &= ~RAD_BACKFACE;
 			}
@@ -224,7 +224,7 @@
 		for(a=0; a<obr->totvlak; a++) {
 			if((a & 255)==0) vlr= obr->vlaknodes[a>>8].vlak; else vlr++;
 			
-			if((radface=RE_vlakren_get_radface(obr, vlr, 0))) {
+			if((radface=RE_vlakren_get_radface(obr, vlr, 0)) && *radface) {
 				rf= *radface;
 				if(*fp!=0.0 && rf->area!=0.0) {
 					*fp *= shootrf->area/rf->area;
@@ -255,7 +255,7 @@
 		for(a=0; a<obr->totvlak; a++) {
 			if((a & 255)==0) vlr= obr->vlaknodes[a>>8].vlak; else vlr++;
 			
-			if((radface=RE_vlakren_get_radface(obr, vlr, 0))) {
+			if((radface=RE_vlakren_get_radface(obr, vlr, 0)) && *radface) {
 				rf= *radface;
 				if(*fp!= 0.0) {
 					
@@ -448,7 +448,7 @@
 		for(a=0; a<obr->totvlak; a++) {
 			if((a & 255)==0) vlr= obr->vlaknodes[a>>8].vlak; else vlr++;
 			
-			if((radface=RE_vlakren_get_radface(obr, vlr, 0))) {
+			if((radface=RE_vlakren_get_radface(obr, vlr, 0)) && *radface) {
 				rf= *radface;
 				
 				/* apply correction */

Modified: trunk/blender/source/blender/render/intern/source/zbuf.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/zbuf.c	2008-02-29 15:50:28 UTC (rev 13917)
+++ trunk/blender/source/blender/render/intern/source/zbuf.c	2008-02-29 16:52:46 UTC (rev 13918)
@@ -2364,7 +2364,7 @@
 			for(a=0; a<obr->totvlak; a++) {
 				if((a & 255)==0) vlr= obr->vlaknodes[a>>8].vlak; else vlr++;
 			
-				if((radface=RE_vlakren_get_radface(obr, vlr, 0))) {
+				if((radface=RE_vlakren_get_radface(obr, vlr, 0)) && *radface) {
 					rf= *radface;
 					if( (rf->flag & RAD_SHOOT)==0 ) {    /* no shootelement */