Moved the autokey mode menu from the timeline header into the timeline menus. Its...

diff --git a/release/ui/buttons_physics_cloth.py b/release/ui/buttons_physics_cloth.py
index 6c499625685841e85d1072ea7e0929072b293c41..9ddf03e3d4dfd42debc47d41f7670fa824fa0bd8 100644 (file)
--- a/release/ui/buttons_physics_cloth.py
+++ b/release/ui/buttons_physics_cloth.py
@@ -91,7 +91,7 @@ class PHYSICS_PT_cloth_cache(PhysicButtonsPanel):
                layout.set_context_pointer("PointCache", cache)
                
                row = layout.row()
-               row.template_list(cache, "point_cache_list", cache, "active_point_cache_index")
+               row.template_list(cache, "point_cache_list", cache, "active_point_cache_index", rows=2)
                col = row.column(align=True)
                col.itemO("ptcache.add_new", icon='ICON_ZOOMIN', text="")
                col.itemO("ptcache.remove", icon='ICON_ZOOMOUT', text="")

diff --git a/release/ui/buttons_physics_softbody.py b/release/ui/buttons_physics_softbody.py
index 35c0c4984361ea7ba5c084d72ba51d9bb7426df7..2beba8c95a0c67642751d31c9e2aa62fd467708a 100644 (file)
--- a/release/ui/buttons_physics_softbody.py
+++ b/release/ui/buttons_physics_softbody.py
@@ -66,7 +66,7 @@ class PHYSICS_PT_softbody_cache(PhysicButtonsPanel):
                layout.set_context_pointer("PointCache", cache)
                
                row = layout.row()
-               row.template_list(cache, "point_cache_list", cache, "active_point_cache_index")
+               row.template_list(cache, "point_cache_list", cache, "active_point_cache_index", rows=2)
                col = row.column(align=True)
                col.itemO("ptcache.add_new", icon='ICON_ZOOMIN', text="")
                col.itemO("ptcache.remove", icon='ICON_ZOOMOUT', text="")

diff --git a/release/ui/space_time.py b/release/ui/space_time.py
index 6e4b5beb161de6fd16003ea404425b9d20995c77..81681e42d9275533ad99936a1690d2cbaf084ce3 100644 (file)
--- a/release/ui/space_time.py
+++ b/release/ui/space_time.py
@@ -33,6 +33,8 @@ class TIME_HT_header(bpy.types.Header):
                        row.itemR(scene, "preview_range_end_frame", text="End")
                
                layout.itemR(scene, "current_frame", text="")
+               
+               layout.itemS()
 
                row = layout.row(align=True)
                row.item_booleanO("screen.frame_jump", "end", False, text="", icon='ICON_REW')
@@ -47,18 +49,13 @@ class TIME_HT_header(bpy.types.Header):
                row.item_booleanO("screen.keyframe_jump", "next", True, text="", icon='ICON_NEXT_KEYFRAME')
                row.item_booleanO("screen.frame_jump", "end", True, text="", icon='ICON_FF')
                
-               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.itemR(rd, "sync_audio", text="", toggle=True, icon='ICON_SPEAKER')
                
                layout.itemS()
                
@@ -88,6 +85,7 @@ class TIME_MT_frame(bpy.types.Menu):
 
        def draw(self, context):
                layout = self.layout
+               tools = context.tool_settings
                
                layout.itemO("marker.add", text="Add Marker")
                layout.itemO("marker.duplicate", text="Duplicate Marker")
@@ -99,6 +97,12 @@ class TIME_MT_frame(bpy.types.Menu):
                
                layout.itemO("time.start_frame_set")
                layout.itemO("time.end_frame_set")
+               
+               layout.itemS()
+               
+               sub = layout.row()
+               sub.active = tools.enable_auto_key
+               sub.itemM("TIME_MT_autokey")
 
 class TIME_MT_playback(bpy.types.Menu):
        __space_type__ = 'TIMELINE'
@@ -108,6 +112,7 @@ class TIME_MT_playback(bpy.types.Menu):
                layout = self.layout
                
                st = context.space_data
+               rd = context.scene.render_data
                
                layout.itemR(st, "play_top_left")
                layout.itemR(st, "play_all_3d")
@@ -115,10 +120,32 @@ class TIME_MT_playback(bpy.types.Menu):
                layout.itemR(st, "play_buttons")
                layout.itemR(st, "play_image")
                layout.itemR(st, "play_sequencer")
+               
                layout.itemS()
+               
                layout.itemR(st, "continue_physics")
+               
+               layout.itemS()
+               
+               layout.itemR(rd, "sync_audio", icon='ICON_SPEAKER')
+
+               
+               
+class TIME_MT_autokey(bpy.types.Menu):
+       __space_type__ = 'TIMELINE'
+       __label__ = "Auto-Keyframing Mode"
+
+       def draw(self, context):
+               layout = self.layout
+               tools = context.tool_settings
+               
+               layout.active = tools.enable_auto_key
+               
+               layout.item_enumR(tools, "autokey_mode", "ADD_REPLACE_KEYS")
+               layout.item_enumR(tools, "autokey_mode", "REPLACE_KEYS")
 
 bpy.types.register(TIME_HT_header)
 bpy.types.register(TIME_MT_view)
 bpy.types.register(TIME_MT_frame)
+bpy.types.register(TIME_MT_autokey)
 bpy.types.register(TIME_MT_playback)

diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 592836c82782b6e3eb35f025edc693a9ea9a6a99..209c771834d7fe5ac25832cb81c0be4c1b3c4493 100644 (file)
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -418,7 +418,7 @@ static void rna_def_tool_settings(BlenderRNA  *brna)
                {0, NULL, 0, NULL, NULL}};
                
        static EnumPropertyItem auto_key_items[] = {
-               {AUTOKEY_MODE_NORMAL, "ADD_REPLACE_KEYS", 0, "Add/Replace", ""},
+               {AUTOKEY_MODE_NORMAL, "ADD_REPLACE_KEYS", 0, "Add & Replace", ""},
                {AUTOKEY_MODE_EDITKEYS, "REPLACE_KEYS", 0, "Replace", ""},
                {0, NULL, 0, NULL, NULL}};