diff options
author | Joseph Eagar <joeedh@gmail.com> | 2010-09-04 09:31:25 +0400 |
---|---|---|
committer | Joseph Eagar <joeedh@gmail.com> | 2010-09-04 09:31:25 +0400 |
commit | bb7339a7aec37bdb2ee8a21599e6c65b37ef1277 (patch) | |
tree | 6fb8da94c6e43098c606f768e722484b04b8645c /release/scripts/ui/space_graph.py | |
parent | 37f2c8a64c3277f100ab084ef1bb3846bc7b2c62 (diff) | |
parent | 8a320974f1b3e6004db3b3ad64f97742f878cbee (diff) |
merge with trunk at r31523
Diffstat (limited to 'release/scripts/ui/space_graph.py')
-rw-r--r-- | release/scripts/ui/space_graph.py | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/release/scripts/ui/space_graph.py b/release/scripts/ui/space_graph.py index 1533b891202..e5ba894f8ad 100644 --- a/release/scripts/ui/space_graph.py +++ b/release/scripts/ui/space_graph.py @@ -44,7 +44,7 @@ class GRAPH_HT_header(bpy.types.Header): layout.template_dopesheet_filter(st.dopesheet) - layout.prop(st, "autosnap", text="") + layout.prop(st, "auto_snap", text="") layout.prop(st, "pivot_point", text="", icon_only=True) row = layout.row(align=True) @@ -71,19 +71,19 @@ class GRAPH_MT_view(bpy.types.Menu): layout.operator("graph.properties", icon='MENU_PANEL') layout.separator() - layout.prop(st, "realtime_updates") - layout.prop(st, "show_cframe_indicator") + layout.prop(st, "use_realtime_update") + layout.prop(st, "show_frame_indicator") layout.prop(st, "show_cursor") layout.prop(st, "show_sliders") - layout.prop(st, "automerge_keyframes") + layout.prop(st, "use_auto_merge_keyframes") layout.separator() if st.show_handles: layout.operator("graph.handles_view_toggle", icon='CHECKBOX_HLT', text="Show All Handles") else: layout.operator("graph.handles_view_toggle", icon='CHECKBOX_DEHLT', text="Show All Handles") - layout.prop(st, "only_selected_curves_handles") - layout.prop(st, "only_selected_keyframe_handles") + layout.prop(st, "use_only_selected_curves_handles") + layout.prop(st, "use_only_selected_keyframe_handles") layout.operator("anim.time_toggle") layout.separator() @@ -204,25 +204,12 @@ class GRAPH_MT_key_transform(bpy.types.Menu): layout.operator("transform.resize", text="Scale") -classes = [ - GRAPH_HT_header, # header/menu classes - GRAPH_MT_view, - GRAPH_MT_select, - GRAPH_MT_channel, - GRAPH_MT_key, - GRAPH_MT_key_transform] - - def register(): - register = bpy.types.register - for cls in classes: - register(cls) + pass def unregister(): - unregister = bpy.types.unregister - for cls in classes: - unregister(cls) + pass if __name__ == "__main__": register() |