2.5 Timeline:

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

diff --git a/release/ui/space_time.py b/release/ui/space_time.py
index 427d52650b32e3eb6144fdc2bae3c169237e3716..645e3e2b4b4b4ed36acd8078a64e500e1d0536e4 100644 (file)
--- a/release/ui/space_time.py
+++ b/release/ui/space_time.py
@@ -40,7 +40,7 @@ class TIME_HT_header(bpy.types.Header):
 
                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 @@ class TIME_HT_header(bpy.types.Header):
                
                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")

diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 7c730e1d2427b157d8b8bfe5b41085c166f22200..2a6d0961464e10eeebb40f41a619a7a6741c0e3b 100644 (file)
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -437,6 +437,10 @@ static void rna_def_tool_settings(BlenderRNA  *brna)
        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);