[Bf-blender-cvs] [2c9f671] id-remap: Fix merge error.
Bastien Montagne
noreply at git.blender.org
Tue May 31 09:53:29 CEST 2016
Commit: 2c9f6714a76399b14e903224dc416adde4ceb7a3
Author: Bastien Montagne
Date: Tue May 31 09:53:16 2016 +0200
Branches: id-remap
https://developer.blender.org/rB2c9f6714a76399b14e903224dc416adde4ceb7a3
Fix merge error.
===================================================================
M source/blender/editors/mesh/editmesh_undo.c
===================================================================
diff --git a/source/blender/editors/mesh/editmesh_undo.c b/source/blender/editors/mesh/editmesh_undo.c
index b9d3fd6..e247ea5 100644
--- a/source/blender/editors/mesh/editmesh_undo.c
+++ b/source/blender/editors/mesh/editmesh_undo.c
@@ -698,7 +698,7 @@ static void free_undo(void *um_v)
MEM_freeN(me->key);
}
- BKE_mesh_free(me, false);
+ BKE_mesh_free(me);
MEM_freeN(me);
}
More information about the Bf-blender-cvs
mailing list