diff options
Diffstat (limited to 'source/blender/render/intern/raytrace/bvh.h')
| -rw-r--r-- | source/blender/render/intern/raytrace/bvh.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/render/intern/raytrace/bvh.h b/source/blender/render/intern/raytrace/bvh.h index e581bbf369a..3ba5bbc624e 100644 --- a/source/blender/render/intern/raytrace/bvh.h +++ b/source/blender/render/intern/raytrace/bvh.h @@ -27,6 +27,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/render/intern/raytrace/bvh.h + * \ingroup render + */ + + #include "MEM_guardedalloc.h" #include "BLI_math.h" @@ -124,7 +129,8 @@ static void bvh_free(Tree *obj) template<class Tree> static void bvh_bb(Tree *obj, float *min, float *max) { - bvh_node_merge_bb(obj->root, min, max); + if(obj->root) + bvh_node_merge_bb(obj->root, min, max); } |