[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37448] trunk/blender/source/blender: Fix #27594: non-active object in weight paint mode doesn't free memory.

[Brecht Van Lommel]

Revision: 37448
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37448
Author:   blendix
Date:     2011-06-13 12:03:13 +0000 (Mon, 13 Jun 2011)
Log Message:
-----------
Fix #27594: non-active object in weight paint mode doesn't free memory.
Also removed some commented out 2.4x code that is already replaced.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/util/ed_util.c
    trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c

Modified: trunk/blender/source/blender/editors/util/ed_util.c
===================================================================
--- trunk/blender/source/blender/editors/util/ed_util.c	2011-06-13 12:03:05 UTC (rev 37447)
+++ trunk/blender/source/blender/editors/util/ed_util.c	2011-06-13 12:03:13 UTC (rev 37448)
@@ -106,10 +106,6 @@
 		if(sce->obedit) {
 			Object *ob= sce->obedit;
 		
-			/* global in meshtools... */
-			mesh_octree_table(NULL, NULL, NULL, 'e');
-			mesh_mirrtopo_table(NULL, 'e');
-			
 			if(ob) {
 				if(ob->type==OB_MESH) {
 					Mesh *me= ob->data;
@@ -122,26 +118,13 @@
 				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) {
-				mesh_octree_table(NULL, NULL, NULL, 'e');
-				mesh_mirrtopo_table(NULL, 'e');
-			}
-		}
 	}
-	
+
+	/* global in meshtools... */
+	mesh_octree_table(NULL, NULL, NULL, 'e');
+	mesh_mirrtopo_table(NULL, 'e');
 }
 
 

Modified: trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c	2011-06-13 12:03:05 UTC (rev 37447)
+++ trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c	2011-06-13 12:03:13 UTC (rev 37448)
@@ -328,7 +328,6 @@
 
 /* bad stuff*/
 
-extern ListBase editelems;
 extern wchar_t *copybuf;
 extern wchar_t *copybufinfo;
 
@@ -394,10 +393,6 @@
 	free_anim_drivers_copybuf();
 	free_fmodifiers_copybuf();
 	free_posebuf();
-//	free_vertexpaint();
-//	free_imagepaint();
-	
-//	fsmenu_free();
 
 	BLF_exit();
 	
@@ -420,10 +415,6 @@
 	BPY_python_end();
 #endif
 
-	if (!G.background) {
-// XXX		UI_filelist_free_icons();
-	}
-	
 	GPU_buffer_pool_free(NULL);
 	GPU_free_unused_buffers();
 	GPU_extensions_exit();