[Bf-blender-cvs] [8d03e044930] master: Fix assert restricting allowed operation

mano-wii noreply at git.blender.org
Mon Aug 26 06:19:12 CEST 2019


Commit: 8d03e04493023d63ec05321ab8dc48dbd22363f2
Author: mano-wii
Date:   Mon Aug 26 01:18:40 2019 -0300
Branches: master
https://developer.blender.org/rB8d03e04493023d63ec05321ab8dc48dbd22363f2

Fix assert restricting allowed operation

===================================================================

M	source/blender/blenkernel/intern/bvhutils.c

===================================================================

diff --git a/source/blender/blenkernel/intern/bvhutils.c b/source/blender/blenkernel/intern/bvhutils.c
index 07fc51953fd..e3df3dd9ba2 100644
--- a/source/blender/blenkernel/intern/bvhutils.c
+++ b/source/blender/blenkernel/intern/bvhutils.c
@@ -1660,12 +1660,13 @@ bool bvhcache_has_tree(const BVHCache *cache, const BVHTree *tree)
  * as that will be done when the cache is freed.
  *
  * A call to this assumes that there was no previous cached tree of the given type
+ * \warning The #BVHTree can be NULL.
  */
 void bvhcache_insert(BVHCache **cache_p, BVHTree *tree, int type)
 {
   BVHCacheItem *item = NULL;
 
-  assert(tree && bvhcache_find(*cache_p, type, &(BVHTree *){0}) == false);
+  assert(bvhcache_find(*cache_p, type, &(BVHTree *){0}) == false);
 
   item = MEM_mallocN(sizeof(BVHCacheItem), "BVHCacheItem");



More information about the Bf-blender-cvs mailing list