Fixed #19571

(was crashing when building a raytree from a scene withouth any geometry)

3 files changed, 47 insertions, 0 deletions

diff --git a/source/blender/render/extern/include/RE_raytrace.h b/source/blender/render/extern/include/RE_raytrace.h
index 22d55bb1a91..7d430d5550a 100644
--- a/source/blender/render/extern/include/RE_raytrace.h
+++ b/source/blender/render/extern/include/RE_raytrace.h
@@ -83,6 +83,7 @@ void RE_rayobject_hint_bb(RayObject *r, RayHint *hint, float *min, float *max);
 /* 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 */
diff --git a/source/blender/render/intern/raytrace/rayobject.cpp b/source/blender/render/intern/raytrace/rayobject.cpp
index 95387cf1ee4..621fd3f794e 100644
--- a/source/blender/render/intern/raytrace/rayobject.cpp
+++ b/source/blender/render/intern/raytrace/rayobject.cpp
@@ -535,3 +535,43 @@ int RE_rayobjectcontrol_test_break(RayObjectControl *control)
 
 	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 );
+}
diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c
index 881a549ad96..4ad4d6370f8 100644
--- a/source/blender/render/intern/source/rayshade.c
+++ b/source/blender/render/intern/source/rayshade.c
@@ -335,6 +335,12 @@ static void makeraytree_single(Render *re)
 		}
 	}
 	
+	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 );