== AutoKeying - Tidy Up ==

This commit restores the "big red button". When Auto-Keying is enabled (record button toggled on), a menu appears beside it to choose which behaviour for auto-keying should be used. This should be more efficient for quickly turning Auto-Keying on/off.

I've also added the relevant version-patches to fix up old files so that sensible default options are in use.

1 files changed, 11 insertions, 6 deletions

diff --git a/source/blender/src/header_time.c b/source/blender/src/header_time.c
index bd7cbb39610..7b98d2f5f4c 100644
--- a/source/blender/src/header_time.c
+++ b/source/blender/src/header_time.c
@@ -524,13 +524,18 @@ void time_buttons(ScrArea *sa)
 			xco, 0, XIC, YIC, 0, 0, 0, 0, 0, "Skip to End frame (Shift UpArrow)");
 	xco+= XIC+8;
 	
-	// FIXME: give this icons (and maybe make it XIC wide again) - it used to use the "ICON_REC" (red dot)
-	uiDefButS(block, MENU, REDRAWINFO, 
-				"Auto-Keying Mode %t|No Auto-Keying %x0|Add/Replace Keys%x1|Replace Keys %x2", 
-				xco, 0, 4*XIC, YIC, &(U.autokey_mode), 0, 1, 0, 0, 
-				"Automatic keyframe insertion for Objects and Bones");
+	uiDefIconButBitS(block, TOG, AUTOKEY_ON, REDRAWINFO, ICON_REC,
+			xco, 0, XIC, YIC, &(U.autokey_mode), 0, 0, 0, 0, "Automatic keyframe insertion for Objects and Bones");
+	xco+= XIC;
+	if (IS_AUTOKEY_ON) {
+		uiDefButS(block, MENU, REDRAWINFO, 
+					"Auto-Keying Mode %t|Add/Replace Keys%x3|Replace Keys %x5", 
+					xco, 0, 3*XIC, YIC, &(U.autokey_mode), 0, 1, 0, 0, 
+					"Mode of automatic keyframe insertion for Objects and Bones");
+		xco+= (4*XIC);
+	}
 	
-	xco+= (4*XIC)+16;
+	xco+= 16;
 
 	uiDefIconButBitI(block, TOG, TIME_WITH_SEQ_AUDIO, B_DIFF, ICON_SPEAKER,
 					 xco, 0, XIC, YIC, &(stime->redraws), 0, 0, 0, 0, "Play back and sync with audio from Sequence Editor");