From ddbc351dd30f414dd5d8ceb1621c8c4cac3d7e43 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 7 May 2016 02:59:19 +1000 Subject: Fix recent issue in recent BVH snap/cache The derivedMesh could free a tree stored by the cache. Now check the cached tree is valid. --- source/blender/editors/transform/transform_snap_object.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'source/blender/editors/transform') diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c index ea34895d3f5..754061c7a8a 100644 --- a/source/blender/editors/transform/transform_snap_object.c +++ b/source/blender/editors/transform/transform_snap_object.c @@ -33,6 +33,7 @@ #include "BLI_kdopbvh.h" #include "BLI_memarena.h" #include "BLI_ghash.h" +#include "BLI_linklist.h" #include "BLI_utildefines.h" #include "DNA_armature_types.h" @@ -659,6 +660,14 @@ static bool snapDerivedMesh( sod->bvh_trees[tree_index] = BLI_memarena_calloc(sctx->cache.mem_arena, sizeof(*treedata)); } treedata = sod->bvh_trees[tree_index]; + + /* the tree is owned by the DM and may have been freed since we last used! */ + if (treedata && treedata->tree) { + if (BLI_linklist_index(dm->bvhCache, treedata->tree) == -1) { + free_bvhtree_from_mesh(treedata); + + } + } } } else { -- cgit v1.2.3