[Bf-blender-cvs] [e3ccce5] soc-2014-shapekey: Fixed meshes without shape keys not being loaded on em exit

[Grigory Revzin]

Commit: e3ccce58647dde27d13e5c3eb35f40a880e58392
Author: Grigory Revzin
Date:   Mon Jul 7 16:24:31 2014 +0400
https://developer.blender.org/rBe3ccce58647dde27d13e5c3eb35f40a880e58392

Fixed meshes without shape keys not being loaded on em exit

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

M	source/blender/editors/mesh/editmesh_utils.c

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

diff --git a/source/blender/editors/mesh/editmesh_utils.c b/source/blender/editors/mesh/editmesh_utils.c
index ddd7fbb..5db76b6 100644
--- a/source/blender/editors/mesh/editmesh_utils.c
+++ b/source/blender/editors/mesh/editmesh_utils.c
@@ -674,14 +674,13 @@ bool EDBM_mesh_from_editmesh(Object *obedit, bool do_free)
 			update_bmesh_shapes(obedit);
 		}
 
-		EDBM_mesh_load(obedit);
-
 		if (do_free && k->scratch.data) {
 			MEM_freeN(k->scratch.data);
 			k->scratch.data = NULL;
 		}
 	}
 	
+	EDBM_mesh_load(obedit);
 
 	EDBM_mesh_normals_update(em);
 	BKE_editmesh_tessface_calc(em);