[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22544] branches/blender2.5/blender: 2. 5 Timeline:

[Thomas Dinges]

Revision: 22544
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22544
Author:   dingto
Date:     2009-08-17 02:22:04 +0200 (Mon, 17 Aug 2009)

Log Message:
-----------
2.5 Timeline:

Some fixes:
* Added missing "Layered" Button.
* Jump to last keyframe operator was called incorrect. 

Modified Paths:
--------------
    branches/blender2.5/blender/release/ui/space_time.py
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c

Modified: branches/blender2.5/blender/release/ui/space_time.py
===================================================================
--- branches/blender2.5/blender/release/ui/space_time.py	2009-08-16 23:37:46 UTC (rev 22543)
+++ branches/blender2.5/blender/release/ui/space_time.py	2009-08-17 00:22:04 UTC (rev 22544)
@@ -40,7 +40,7 @@
 
 		row = layout.row(align=True)
 		row.itemO("screen.frame_jump", text="", icon='ICON_REW')
-		row.itemO("screen.keyframe_jump", text="", icon='ICON_PREV_KEYFRAME')
+		row.item_booleanO("screen.keyframe_jump", "next", False, text="", icon='ICON_PREV_KEYFRAME')
 		if not screen.animation_playing:
 			row.item_booleanO("screen.animation_play", "reverse", True, text="", icon='ICON_PLAY_REVERSE')
 			row.itemO("screen.animation_play", text="", icon='ICON_PLAY')
@@ -53,18 +53,21 @@
 		
 		layout.itemS()
 		
+		layout.itemR(rd, "sync_audio", text="", toggle=True, icon='ICON_SPEAKER')
+		
+		layout.itemS()
+		
 		row = layout.row(align=True)
 		row.itemR(tools, "enable_auto_key", text="", toggle=True, icon='ICON_REC')
 		sub = row.row()
 		sub.active = tools.enable_auto_key
 		sub.itemR(tools, "autokey_mode", text="")
+		if screen.animation_playing and tools.enable_auto_key:
+			subsub = row.row()
+			subsub.itemR(tools, "record_with_nla", toggle=True)
 		
 		layout.itemS()
-		
-		layout.itemR(rd, "sync_audio", text="", toggle=True, icon='ICON_SPEAKER')
-		
-		layout.itemS()
-		
+
 		row = layout.row(align=True)
 		row.itemR(scene, "active_keyingset")
 		row.itemO("anim.insert_keyframe", text="", icon="ICON_KEY_HLT")

Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c	2009-08-16 23:37:46 UTC (rev 22543)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c	2009-08-17 00:22:04 UTC (rev 22544)
@@ -437,6 +437,10 @@
 	RNA_def_property_enum_sdna(prop, NULL, "autokey_mode");
 	RNA_def_property_enum_items(prop, auto_key_items);
 	RNA_def_property_ui_text(prop, "Auto-Keying Mode", "Mode of automatic keyframe insertion for Objects and Bones");
+	
+	prop= RNA_def_property(srna, "record_with_nla", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "autokey_flag", ANIMRECORD_FLAG_WITHNLA);
+	RNA_def_property_ui_text(prop, "Layered", "Add a new NLA Track + Strip for every loop/pass made over the animation to allow non-destructive tweaking.");
 
 	/* UV */
 	prop= RNA_def_property(srna, "uv_selection_mode", PROP_ENUM, PROP_NONE);