== Action Editor - Header Buttons Shuffle ==

* Changed the order of Copy/Paste and AutoSnap buttons
* Auto-snap menu now has more descriptive names (off --> No Snap)

1 files changed, 16 insertions, 16 deletions

diff --git a/source/blender/src/header_action.c b/source/blender/src/header_action.c
index 9e858cb8307..5fa5c6fb97e 100644
--- a/source/blender/src/header_action.c
+++ b/source/blender/src/header_action.c
@@ -1241,24 +1241,8 @@ void action_buttons(void)
 
 	uiClearButLock();
 
-	/* draw AUTOSNAP */
 	xco += 8;
 	
-	if (G.saction->flag & SACTION_DRAWTIME) {
-		uiDefButS(block, MENU, B_REDR,
-				"Auto-Snap Keyframes %t|Off %x0|Second Step %x1|Nearest Second %x2|Nearest Marker %x3", 
-				xco,0,70,YIC, &(G.saction->autosnap), 0, 1, 0, 0, 
-				"Auto-snapping mode for keyframes when transforming");
-	}
-	else {
-		uiDefButS(block, MENU, B_REDR, 
-				"Auto-Snap Keyframes %t|Off %x0|Frame Step %x1|Nearest Frame %x2|Nearest Marker %x3", 
-				xco,0,70,YIC, &(G.saction->autosnap), 0, 1, 0, 0, 
-				"Auto-snapping mode for keyframes when transforming");
-	}
-	
-	xco += (70 + 8);
-	
 	/* COPY PASTE */
 	uiBlockBeginAlign(block);
 	if (curarea->headertype==HEADERTOP) {
@@ -1272,6 +1256,22 @@ void action_buttons(void)
 	uiBlockEndAlign(block);
 	xco += (XIC + 8);
 	
+	/* draw AUTOSNAP */
+	if (G.saction->flag & SACTION_DRAWTIME) {
+		uiDefButS(block, MENU, B_REDR,
+				"Auto-Snap Keyframes %t|No Snap %x0|Second Step Snap %x1|Nearest Second Snap %x2|Nearest Marker Snap%x3", 
+				xco,0,70,YIC, &(G.saction->autosnap), 0, 1, 0, 0, 
+				"Auto-snapping mode for keyframes when transforming");
+	}
+	else {
+		uiDefButS(block, MENU, B_REDR, 
+				"Auto-Snap Keyframes %t|No Snap %x0|Frame Step Snap %x1|Nearest Frame Snap %x2|Nearest Marker Snap %x3", 
+				xco,0,70,YIC, &(G.saction->autosnap), 0, 1, 0, 0, 
+				"Auto-snapping mode for keyframes when transforming");
+	}
+	
+	xco += (70 + 8);
+	
 	/* draw LOCK */
 	uiDefIconButS(block, ICONTOG, 1, ICON_UNLOCKED,	xco, 0, XIC, YIC, 
 				  &(G.saction->lock), 0, 0, 0, 0,