[Bf-blender-cvs] [c677bd4] master: Fix (unreported) crash in mesh remap (i.e. data transfer).

Bastien Montagne noreply at git.blender.org
Fri Aug 7 16:37:25 CEST 2015


Commit: c677bd44ceca6ebd85b5aaf225d551fd1da1bdd1
Author: Bastien Montagne
Date:   Fri Aug 7 16:18:13 2015 +0200
Branches: master
https://developer.blender.org/rBc677bd44ceca6ebd85b5aaf225d551fd1da1bdd1

Fix (unreported) crash in mesh remap (i.e. data transfer).

Issue from rBabbd82a50, loops data were not correctly protected against multi-freeing in bvhtree data.

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

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

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

diff --git a/source/blender/blenkernel/intern/mesh_remap.c b/source/blender/blenkernel/intern/mesh_remap.c
index 827a1bf..993921c 100644
--- a/source/blender/blenkernel/intern/mesh_remap.c
+++ b/source/blender/blenkernel/intern/mesh_remap.c
@@ -1417,6 +1417,9 @@ void BKE_mesh_remap_calc_loops_from_dm(
 					if (verts_allocated_src) {
 						verts_allocated_src = false;  /* Only 'give' our verts once, to first tree! */
 					}
+					if (loops_allocated_src) {
+						loops_allocated_src = false;  /* Only 'give' our loops once, to first tree! */
+					}
 					if (looptri_allocated_src) {
 						looptri_allocated_src = false;  /* Only 'give' our looptri once, to first tree! */
 					}




More information about the Bf-blender-cvs mailing list