[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [10968] trunk/blender/source/blender/src/ editnla.c: == NLA Editor - Bugfix 6780 ==

[Joshua Leung]

Revision: 10968
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10968
Author:   aligorith
Date:     2007-06-19 14:25:44 +0200 (Tue, 19 Jun 2007)

Log Message:
-----------
== NLA Editor - Bugfix 6780 ==

Deleting a marker using DELKEY or XKEY requires undoing action twice. Changed order of deleting markers and deleting keys/strips to be in line with Action Editor.

Modified Paths:
--------------
    trunk/blender/source/blender/src/editnla.c

Modified: trunk/blender/source/blender/src/editnla.c
===================================================================
--- trunk/blender/source/blender/src/editnla.c	2007-06-19 11:52:14 UTC (rev 10967)
+++ trunk/blender/source/blender/src/editnla.c	2007-06-19 12:25:44 UTC (rev 10968)
@@ -1298,10 +1298,10 @@
 		}
 	}
 	
+	recalc_all_ipos();	// bad
 	synchronize_action_strips();
 	
 	BIF_undo_push("Delete NLA keys");
-	recalc_all_ipos();	// bad
 	allspace(REMAKEIPO,0);
 	allqueue (REDRAWVIEW3D, 0);
 	allqueue(REDRAWNLA, 0);
@@ -2143,11 +2143,11 @@
 			case XKEY:
 				if (mval[0]>=NLAWIDTH) {
 					if (okee("Erase selected?")) {
-						remove_marker();
-						
 						delete_nlachannel_keys();
 						update_for_newframe_muted();
 						
+						remove_marker();
+						
 						allqueue(REDRAWTIME, 0);
 						allqueue(REDRAWIPO, 0);
 						allqueue(REDRAWACTION, 0);