From fc7624a6bed302f719bc78664f29c011c7fc2bf6 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 27 Mar 2012 04:54:52 +0000 Subject: [PATCH] fix for undoMesh_to_editbtMesh not setting BMEditMesh.ob field. error found by XercesBlue on IRC --- source/blender/editors/mesh/editmesh_utils.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/source/blender/editors/mesh/editmesh_utils.c b/source/blender/editors/mesh/editmesh_utils.c index 22420c50e2f..3958a28f441 100644 --- a/source/blender/editors/mesh/editmesh_utils.c +++ b/source/blender/editors/mesh/editmesh_utils.c @@ -529,9 +529,9 @@ static void *editbtMesh_to_undoMesh(void *emv, void *obdata) return um; } -static void undoMesh_to_editbtMesh(void *umv, void *emv, void *UNUSED(obdata)) +static void undoMesh_to_editbtMesh(void *umv, void *em_v, void *UNUSED(obdata)) { - BMEditMesh *em = emv, *em2; + BMEditMesh *em = em_v, *em_tmp; Object *ob; undomesh *um = umv; BMesh *bm; @@ -545,12 +545,13 @@ static void undoMesh_to_editbtMesh(void *umv, void *emv, void *UNUSED(obdata)) bm = BM_mesh_create(&bm_mesh_allocsize_default); BMO_op_callf(bm, "mesh_to_bmesh mesh=%p object=%p set_shapekey=%b", &um->me, ob, FALSE); - em2 = BMEdit_Create(bm, TRUE); - *em = *em2; + em_tmp = BMEdit_Create(bm, TRUE); + *em = *em_tmp; em->selectmode = um->selectmode; + em->ob = ob; - MEM_freeN(em2); + MEM_freeN(em_tmp); }