[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38687] branches/bmesh/blender/source/ blender/editors/util/ed_util.c: recent merges lost changes in this file, manually merge changes from -r37078:37500

[Campbell Barton]

Revision: 38687
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38687
Author:   campbellbarton
Date:     2011-07-25 10:14:02 +0000 (Mon, 25 Jul 2011)
Log Message:
-----------
recent merges lost changes in this file, manually merge changes from 
-r37078:37500

Revision Links:
--------------
    
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37078

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/editors/util/ed_util.c

Modified: branches/bmesh/blender/source/blender/editors/util/ed_util.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/util/ed_util.c        
2011-07-25 10:07:50 UTC (rev 38686)
+++ branches/bmesh/blender/source/blender/editors/util/ed_util.c        
2011-07-25 10:14:02 UTC (rev 38687)
@@ -106,25 +106,42 @@
                if(sce->obedit) {
                        Object *ob= sce->obedit;
                
+                       /* global in meshtools... */
+                       //BMESH_TODO mesh_octree_table(NULL, NULL, NULL, 'e');
+                       //BMESH_TODO mesh_mirrtopo_table(NULL, 'e');
+                       
                        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) {
                                        ED_armature_edit_free(ob);
                                }
+                               else if(ob->type==OB_FONT) {
+                                       //                      free_editText();
+                               }
+                               //              else if(ob->type==OB_MBALL) 
+                               //                      
BLI_freelistN(&editelems);
+                               //      free_editLatt();
+                               //      free_posebuf();         // XXX this is 
still a global...
                        }
                }
+               else if(sce->basact && sce->basact->object) {
+                       Object *ob= sce->basact->object;
+                       
+                       /* if weight-painting is on, free mesh octree data */
+                       if(ob->mode & OB_MODE_WEIGHT_PAINT) {
+                               //BMESH_TODO mesh_octree_table(NULL, NULL, 
NULL, 'e');
+                               //BMESH_TODO mesh_mirrtopo_table(NULL, 'e');
+                       }
+               }
        }
-
-       /* global in meshtools... */
-       mesh_octree_table(NULL, NULL, NULL, 'e');
-       mesh_mirrtopo_table(NULL, 'e');
+       
 }
 
 

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs