[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34036] trunk/blender/source/blender: Bugfix #25457

[Ton Roosendaal]

Revision: 34036
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34036
Author:   ton
Date:     2011-01-03 13:48:16 +0100 (Mon, 03 Jan 2011)

Log Message:
-----------
Bugfix #25457

After loading file, the Undo-push happened too early, causing an
undo for the first action to show animated setups wrong.

(material.c: removed old crap)

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/material.c
    trunk/blender/source/blender/windowmanager/intern/wm_files.c

Modified: trunk/blender/source/blender/blenkernel/intern/material.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/material.c	2011-01-03 12:41:16 UTC (rev 34035)
+++ trunk/blender/source/blender/blenkernel/intern/material.c	2011-01-03 12:48:16 UTC (rev 34036)
@@ -1341,7 +1341,6 @@
 
 /* copy/paste buffer, if we had a propper py api that would be better */
 Material matcopybuf;
-// MTex mtexcopybuf;
 static short matcopied=0;
 
 void clear_matcopybuf(void)
@@ -1352,7 +1351,6 @@
 
 void free_matcopybuf(void)
 {
-//	extern MTex mtexcopybuf;	/* buttons.c */
 	int a;
 
 	for(a=0; a<MAX_MTEX; a++) {
@@ -1373,7 +1371,6 @@
 		MEM_freeN(matcopybuf.nodetree);
 		matcopybuf.nodetree= NULL;
 	}
-//	default_mtex(&mtexcopybuf);
 
 	matcopied= 0;
 }
@@ -1442,10 +1439,4 @@
 	}
 
 	ma->nodetree= ntreeCopyTree(matcopybuf.nodetree, 0);
-
-	/*
-	BIF_preview_changed(ID_MA);
-	BIF_undo_push("Paste material settings");
-	scrarea_queue_winredraw(curarea);
-	*/
 }

Modified: trunk/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_files.c	2011-01-03 12:41:16 UTC (rev 34035)
+++ trunk/blender/source/blender/windowmanager/intern/wm_files.c	2011-01-03 12:48:16 UTC (rev 34036)
@@ -305,9 +305,6 @@
 				write_history();
 		}
 
-// XXX		undo_editmode_clear();
-		BKE_reset_undo();
-		BKE_write_undo(C, "original");	/* save current state */
 
 		WM_event_add_notifier(C, NC_WM|ND_FILEREAD, NULL);
 //		refresh_interface_font();
@@ -323,6 +320,11 @@
 		BPY_load_user_modules(C);
 #endif
 		CTX_wm_window_set(C, NULL); /* exits queues */
+
+		// XXX		undo_editmode_clear();
+		BKE_reset_undo();
+		BKE_write_undo(C, "original");	/* save current state */
+		
 	}
 	else if(retval==1)
 		BKE_write_undo(C, "Import file");