Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorMatt Ebb <matt@mke3.net>2010-06-30 08:09:58 +0400
committerMatt Ebb <matt@mke3.net>2010-06-30 08:09:58 +0400
commit0d5b688746e2b6b69800969bf85a705db51ed751 (patch)
tree010e0ab2d484da7543fbfa96b2e8995dca7acb68 /source
parenta35680a3e0986496495c8bb8b900478b4c65600e (diff)
Fix [#22643] Renderging Crash. 2.5
Diffstat (limited to 'source')
-rw-r--r--source/blender/render/intern/source/rayshade.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c
index bdc1dcc2782..ed52f37fcfa 100644
--- a/source/blender/render/intern/source/rayshade.c
+++ b/source/blender/render/intern/source/rayshade.c
@@ -241,7 +241,9 @@ RayObject* makeraytree_object(Render *re, ObjectInstanceRen *obi)
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 @@ static void makeraytree_single(Render *re)
if(test_break(re))
break;
- RE_rayobject_add( re->raytree, obj );
+ if (obj)
+ RE_rayobject_add( re->raytree, obj );
}
else
{