diff options
author | Thomas Dinges <blender@dingto.org> | 2009-08-17 04:22:04 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2009-08-17 04:22:04 +0400 |
commit | 5f7ed837358e8bb5bdc94926156154515aa9d633 (patch) | |
tree | 2e029c1d4116ef2967b3de5aa5292fcd5ed952d8 | |
parent | bee5f9f09e0e2fd35c59b190449b43332a6be0b7 (diff) |
2.5 Timeline:
Some fixes:
* Added missing "Layered" Button.
* Jump to last keyframe operator was called incorrect.
-rw-r--r-- | release/ui/space_time.py | 15 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 4 |
2 files changed, 13 insertions, 6 deletions
diff --git a/release/ui/space_time.py b/release/ui/space_time.py index 427d52650b3..645e3e2b4b4 100644 --- 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 7c730e1d242..2a6d0961464 100644 --- 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); |