[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29812] trunk/blender/source/blender/ render/intern/source/rayshade.c: Fix [#22643] Renderging Crash.

[Matt Ebb]

Revision: 29812
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29812
Author:   broken
Date:     2010-06-30 06:09:58 +0200 (Wed, 30 Jun 2010)

Log Message:
-----------
Fix [#22643] Renderging Crash. 2.5

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

Modified: trunk/blender/source/blender/render/intern/source/rayshade.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/rayshade.c	2010-06-30 03:53:41 UTC (rev 29811)
+++ trunk/blender/source/blender/render/intern/source/rayshade.c	2010-06-30 04:09:58 UTC (rev 29812)
@@ -241,7 +241,9 @@
 			if(is_raytraceable_vlr(re, vlr))
 				faces++;
 		}
-		assert( faces > 0 );
+		
+		if (faces == 0)
+			return NULL;
 
 		//Create Ray cast accelaration structure		
 		raytree = RE_rayobject_create( re,  re->r.raytrace_structure, faces );
@@ -375,7 +377,8 @@
 			if(test_break(re))
 				break;
 
-			RE_rayobject_add( re->raytree, obj );
+			if (obj)
+				RE_rayobject_add( re->raytree, obj );
 		}
 		else
 		{