2.5

Two fixes:

- objects in editmode now update data on saving .blend
- uifonts and uistyles were not freed yet on reading files
  yet.

4 files changed, 10 insertions, 23 deletions

diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index fa25153a158..8a1086386e1 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -3059,7 +3059,6 @@ void UI_init_userdef(void)
 
 void UI_exit(void)
 {
-	uiStyleExit();
 	ui_resources_free();
 }
 
diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h
index 8aaec7f31b0..83cea53e5fa 100644
--- a/source/blender/editors/interface/interface_intern.h
+++ b/source/blender/editors/interface/interface_intern.h
@@ -382,7 +382,6 @@ void ui_widget_color_init(struct ThemeUI *tui);
 
 /* interface_style.c */
 void uiStyleInit(void);
-void uiStyleExit(void);
 
 /* resources.c */
 void init_userdef_do_versions(void);
diff --git a/source/blender/editors/interface/interface_style.c b/source/blender/editors/interface/interface_style.c
index db5dacf5a75..8c07a6ea0ab 100644
--- a/source/blender/editors/interface/interface_style.c
+++ b/source/blender/editors/interface/interface_style.c
@@ -264,14 +264,6 @@ void uiStyleInit(void)
 	}
 }
 
-
-void uiStyleExit(void)
-{
-	BLI_freelistN(&U.uifonts);
-	BLI_freelistN(&U.uistyles);
-	
-}
-
 void uiStyleFontSet(uiFontStyle *fs)
 {
 	uiFont *font= uifont_to_blfont(fs->uifont_id);
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 2ec9d1aed37..234a1cc0ea4 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -3204,7 +3204,6 @@ void ED_object_exit_editmode(bContext *C, int flag)
 {
 	Scene *scene= CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
-	Object *ob;
 	int freedata = flag & EM_FREEDATA;
 	
 	if(obedit==NULL) return;
@@ -3252,22 +3251,20 @@ void ED_object_exit_editmode(bContext *C, int flag)
 //		if(freedata) BLI_freelistN(&editelems);
 	}
 	
-	ob= obedit;
-	
-	/* for example; displist make is different in editmode */
-	if(freedata) obedit= NULL;
-	scene->obedit= obedit; // XXX for context
-	
-	/* also flush ob recalc, doesn't take much overhead, but used for particles */
-	DAG_object_flush_update(scene, ob, OB_RECALC_OB|OB_RECALC_DATA);
+	/* freedata only 0 now on file saves */
+	if(freedata) {
+		/* for example; displist make is different in editmode */
+		scene->obedit= NULL; // XXX for context
+		
+		/* also flush ob recalc, doesn't take much overhead, but used for particles */
+		DAG_object_flush_update(scene, obedit, OB_RECALC_OB|OB_RECALC_DATA);
 	
-	if(obedit==NULL) // XXX && (flag & EM_FREEUNDO)) 
 		ED_undo_push(C, "Editmode");
 	
-	if(flag & EM_WAITCURSOR) waitcursor(0);
+		if(flag & EM_WAITCURSOR) waitcursor(0);
 	
-	WM_event_add_notifier(C, NC_SCENE|ND_MODE|NS_MODE_OBJECT, scene);
-
+		WM_event_add_notifier(C, NC_SCENE|ND_MODE|NS_MODE_OBJECT, scene);
+	}
 }