[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45203] trunk/blender/source/blender/ editors/mesh/editmesh_utils.c: fix for undoMesh_to_editbtMesh not setting BMEditMesh.ob field.

[Campbell Barton]

Revision: 45203
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45203
Author:   campbellbarton
Date:     2012-03-27 04:54:52 +0000 (Tue, 27 Mar 2012)
Log Message:
-----------
fix for undoMesh_to_editbtMesh not setting BMEditMesh.ob field.

error found by XercesBlue on IRC

Modified Paths:
--------------
    trunk/blender/source/blender/editors/mesh/editmesh_utils.c

Modified: trunk/blender/source/blender/editors/mesh/editmesh_utils.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_utils.c	2012-03-27 04:46:52 UTC (rev 45202)
+++ trunk/blender/source/blender/editors/mesh/editmesh_utils.c	2012-03-27 04:54:52 UTC (rev 45203)
@@ -529,9 +529,9 @@
 	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 @@
 	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);
 }