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:
authorBastien Montagne <montagne29@wanadoo.fr>2015-08-07 17:18:13 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2015-08-07 17:35:38 +0300
commitc677bd44ceca6ebd85b5aaf225d551fd1da1bdd1 (patch)
treea48ce1844377c7f9000c096ed4e319273719e25b /source/blender/blenkernel/intern/mesh_remap.c
parent930fc7d1575304977b4a82b1986d2d8db0498e50 (diff)
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.
Diffstat (limited to 'source/blender/blenkernel/intern/mesh_remap.c')
-rw-r--r--source/blender/blenkernel/intern/mesh_remap.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/mesh_remap.c b/source/blender/blenkernel/intern/mesh_remap.c
index 827a1bf895f..993921c22e0 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! */
}