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
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2011-03-12 01:27:06 +0300
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2011-03-12 01:27:06 +0300
commit9dfda4b002ab438008f4e00a5c8e98c41540a141 (patch)
tree4da8fa4aa06a342d263b4fc482eda9b50dbef712 /source/blender/render/intern/raytrace/vbvh.h
parent60a4c9d09ea1d7216139c93466fb2ca9bef6648c (diff)
Fix #26203: crash with empty raytree, all types should survive this now.
Also added a check for -inf/inf bounding boxes, just to be sure.
Diffstat (limited to 'source/blender/render/intern/raytrace/vbvh.h')
-rw-r--r--source/blender/render/intern/raytrace/vbvh.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/render/intern/raytrace/vbvh.h b/source/blender/render/intern/raytrace/vbvh.h
index d91a7c209c8..62cccdb5af9 100644
--- a/source/blender/render/intern/raytrace/vbvh.h
+++ b/source/blender/render/intern/raytrace/vbvh.h
@@ -157,9 +157,12 @@ struct BuildBinaryVBVH
Node *_transform(RTBuilder *builder)
{
-
int size = rtbuild_size(builder);
- if(size == 1)
+
+ if(size == 0) {
+ return NULL;
+ }
+ else if(size == 1)
{
Node *node = create_node();
INIT_MINMAX(node->bb, node->bb+3);