svn merge ^/trunk/blender -r41226:41227 .
[blender.git] / source / blender / editors / util / ed_util.c
index fef4286..52ac749 100644 (file)
@@ -107,10 +107,10 @@ void ED_editors_exit(bContext *C)
                        if(ob) {
                                if(ob->type==OB_MESH) {
                                        Mesh *me= ob->data;
-                                       if(me->edit_mesh) {
-                                               free_editMesh(me->edit_mesh);
-                                               MEM_freeN(me->edit_mesh);
-                                               me->edit_mesh= NULL;
+                                       if(me->edit_btmesh) {
+                                               EDBM_FreeEditBMesh(me->edit_btmesh);
+                                               MEM_freeN(me->edit_btmesh);
+                                               me->edit_btmesh= NULL;
                                        }
                                }
                                else if(ob->type==OB_ARMATURE) {
@@ -121,8 +121,8 @@ void ED_editors_exit(bContext *C)
        }
 
        /* global in meshtools... */
-       mesh_octree_table(NULL, NULL, NULL, 'e');
-       mesh_mirrtopo_table(NULL, 'e');
+       //BMESH_TODO mesh_octree_table(NULL, NULL, NULL, 'e');
+       //BMESH_TODO mesh_mirrtopo_table(NULL, 'e');
 }