[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23711] trunk/blender/source/blender/ render: Fixed #19571

[Andre Susano Pinto]

Revision: 23711
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23711
Author:   jaguarandi
Date:     2009-10-08 13:24:06 +0200 (Thu, 08 Oct 2009)

Log Message:
-----------
Fixed #19571
(was crashing when building a raytree from a scene withouth any geometry)

Modified Paths:
--------------
    trunk/blender/source/blender/render/extern/include/RE_raytrace.h
    trunk/blender/source/blender/render/intern/raytrace/rayobject.cpp
    trunk/blender/source/blender/render/intern/source/rayshade.c

Modified: trunk/blender/source/blender/render/extern/include/RE_raytrace.h
===================================================================
--- trunk/blender/source/blender/render/extern/include/RE_raytrace.h	2009-10-08 11:12:03 UTC (rev 23710)
+++ trunk/blender/source/blender/render/extern/include/RE_raytrace.h	2009-10-08 11:24:06 UTC (rev 23711)
@@ -83,6 +83,7 @@
 /* RayObject constructors */
 RayObject* RE_rayobject_octree_create(int ocres, int size);
 RayObject* RE_rayobject_instance_create(RayObject *target, float transform[][4], void *ob, void *target_ob);
+RayObject* RE_rayobject_empty_create();
 
 RayObject* RE_rayobject_blibvh_create(int size);	/* BLI_kdopbvh.c   */
 RayObject* RE_rayobject_vbvh_create(int size);		/* raytrace/rayobject_vbvh.c */

Modified: trunk/blender/source/blender/render/intern/raytrace/rayobject.cpp
===================================================================
--- trunk/blender/source/blender/render/intern/raytrace/rayobject.cpp	2009-10-08 11:12:03 UTC (rev 23710)
+++ trunk/blender/source/blender/render/intern/raytrace/rayobject.cpp	2009-10-08 11:24:06 UTC (rev 23711)
@@ -535,3 +535,43 @@
 
 	return 0;
 }
+
+
+/*
+ * Empty raytree
+ */
+static int RE_rayobject_empty_intersect(RayObject *o, Isect *is)
+{
+	return 0;
+}
+
+static void RE_rayobject_empty_free(RayObject *o)
+{
+}
+
+static void RE_rayobject_empty_bb(RayObject *o, float *min, float *max)
+{
+	return;
+}
+
+static float RE_rayobject_empty_cost(RayObject *o)
+{
+	return 0.0;
+}
+
+static RayObjectAPI empty_api =
+{
+	RE_rayobject_empty_intersect,
+	NULL, //static void RE_rayobject_instance_add(RayObject *o, RayObject *ob);
+	NULL, //static void RE_rayobject_instance_done(RayObject *o);
+	RE_rayobject_empty_free,
+	RE_rayobject_empty_bb,
+	RE_rayobject_empty_cost
+};
+
+static RayObject empty_raytree = { &empty_api, {0, 0} };
+
+RayObject *RE_rayobject_empty_create()
+{
+	return RE_rayobject_unalignRayAPI( &empty_raytree );
+}

Modified: trunk/blender/source/blender/render/intern/source/rayshade.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/rayshade.c	2009-10-08 11:12:03 UTC (rev 23710)
+++ trunk/blender/source/blender/render/intern/source/rayshade.c	2009-10-08 11:24:06 UTC (rev 23711)
@@ -335,6 +335,12 @@
 		}
 	}
 	
+	if(faces + special == 0)
+	{
+		re->raytree = RE_rayobject_empty_create();
+		return;
+	}
+	
 	//Create raytree
 	raytree = re->raytree = RE_rayobject_create( re, re->r.raytrace_structure, faces+special );