From 66a028a5761c44fa37963443c78bd7baf04ff551 Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Fri, 27 Mar 2015 15:23:39 +0100 Subject: Proportional editing for IPO editor - version ready for feedback by artists. This works by using the distance in the x axis only (usually artists want to influence nearby keyframes based on timing, not value). Tweaking handles is the same as tweaking the central handle. It's a bit ambiguous if proportional editing is really meaningful for handles but will leave that for artists to decide. --- release/scripts/startup/bl_ui/space_graph.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'release/scripts/startup/bl_ui/space_graph.py') diff --git a/release/scripts/startup/bl_ui/space_graph.py b/release/scripts/startup/bl_ui/space_graph.py index d3e1a866e43..4c3f4bb695e 100644 --- a/release/scripts/startup/bl_ui/space_graph.py +++ b/release/scripts/startup/bl_ui/space_graph.py @@ -29,6 +29,7 @@ class GRAPH_HT_header(Header): from bl_ui.space_dopesheet import dopesheet_filter layout = self.layout + toolsettings = context.tool_settings st = context.space_data @@ -46,6 +47,11 @@ class GRAPH_HT_header(Header): row.active = st.use_normalization row.prop(st, "use_auto_normalization", text="Auto") + row = layout.row(align=True) + row.prop(toolsettings, "proportional_edit", icon_only=True) + if toolsettings.proportional_edit != 'DISABLED': + row.prop(toolsettings, "proportional_edit_falloff", icon_only=True) + layout.prop(st, "auto_snap", text="") layout.prop(st, "pivot_point", icon_only=True) -- cgit v1.2.3 From 851ea206d05b4d91423bc754ab2cc4bb0d1f6f38 Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Thu, 9 Apr 2015 18:29:58 +0200 Subject: Separate proportional editing options for graph and action editor. --- release/scripts/startup/bl_ui/space_graph.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'release/scripts/startup/bl_ui/space_graph.py') diff --git a/release/scripts/startup/bl_ui/space_graph.py b/release/scripts/startup/bl_ui/space_graph.py index 4c3f4bb695e..485bd271060 100644 --- a/release/scripts/startup/bl_ui/space_graph.py +++ b/release/scripts/startup/bl_ui/space_graph.py @@ -48,9 +48,12 @@ class GRAPH_HT_header(Header): row.prop(st, "use_auto_normalization", text="Auto") row = layout.row(align=True) - row.prop(toolsettings, "proportional_edit", icon_only=True) - if toolsettings.proportional_edit != 'DISABLED': - row.prop(toolsettings, "proportional_edit_falloff", icon_only=True) + + row.prop(toolsettings, "use_proportional_ipo", + text="", icon_only=True) + if toolsettings.use_proportional_ipo: + row.prop(toolsettings, "proportional_edit_falloff", + text="", icon_only=True) layout.prop(st, "auto_snap", text="") layout.prop(st, "pivot_point", icon_only=True) -- cgit v1.2.3 From 31d354dfa34306dfa94671e3c6fb11666e6bb48b Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 10 Apr 2015 13:41:57 +1000 Subject: rename _ipo -> _fcurve --- release/scripts/startup/bl_ui/space_graph.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'release/scripts/startup/bl_ui/space_graph.py') diff --git a/release/scripts/startup/bl_ui/space_graph.py b/release/scripts/startup/bl_ui/space_graph.py index 485bd271060..c00e0a1f9d9 100644 --- a/release/scripts/startup/bl_ui/space_graph.py +++ b/release/scripts/startup/bl_ui/space_graph.py @@ -49,7 +49,7 @@ class GRAPH_HT_header(Header): row = layout.row(align=True) - row.prop(toolsettings, "use_proportional_ipo", + row.prop(toolsettings, "use_proportional_fcurve", text="", icon_only=True) if toolsettings.use_proportional_ipo: row.prop(toolsettings, "proportional_edit_falloff", -- cgit v1.2.3 From 40334b4920d6f43a6926eef32dda94555f84ead4 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 10 Apr 2015 13:44:26 +1000 Subject: missed last commit --- release/scripts/startup/bl_ui/space_graph.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'release/scripts/startup/bl_ui/space_graph.py') diff --git a/release/scripts/startup/bl_ui/space_graph.py b/release/scripts/startup/bl_ui/space_graph.py index c00e0a1f9d9..c838016b0dc 100644 --- a/release/scripts/startup/bl_ui/space_graph.py +++ b/release/scripts/startup/bl_ui/space_graph.py @@ -51,7 +51,7 @@ class GRAPH_HT_header(Header): row.prop(toolsettings, "use_proportional_fcurve", text="", icon_only=True) - if toolsettings.use_proportional_ipo: + if toolsettings.use_proportional_fcurve: row.prop(toolsettings, "proportional_edit_falloff", text="", icon_only=True) -- cgit v1.2.3 From 253d15ea16a90af1c2ac28d933b73fe7576e0315 Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Fri, 10 Apr 2015 11:52:54 +0200 Subject: Move clean operator from action/ipo editors to the delete menu, now that O key is bound to proportional editing. --- release/scripts/startup/bl_ui/space_graph.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'release/scripts/startup/bl_ui/space_graph.py') diff --git a/release/scripts/startup/bl_ui/space_graph.py b/release/scripts/startup/bl_ui/space_graph.py index c838016b0dc..4503a0f4c68 100644 --- a/release/scripts/startup/bl_ui/space_graph.py +++ b/release/scripts/startup/bl_ui/space_graph.py @@ -280,5 +280,18 @@ class GRAPH_MT_key_transform(Menu): layout.operator("transform.rotate", text="Rotate") layout.operator("transform.resize", text="Scale") +class GRAPH_MT_delete(Menu): + bl_label = "Delete" + + def draw(self, context): + layout = self.layout + + layout.operator("graph.delete") + + layout.separator() + + layout.operator("graph.clean") + + if __name__ == "__main__": # only for live edit. bpy.utils.register_module(__name__) -- cgit v1.2.3 From 364b6b29ff2ea19a31fdfc8e08b75ce0d46df40b Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Mon, 13 Apr 2015 14:30:17 +0200 Subject: New operator for action and graph editor that centers around current scene frame, bound to numberpad zero. --- release/scripts/startup/bl_ui/space_graph.py | 1 + 1 file changed, 1 insertion(+) (limited to 'release/scripts/startup/bl_ui/space_graph.py') diff --git a/release/scripts/startup/bl_ui/space_graph.py b/release/scripts/startup/bl_ui/space_graph.py index 4503a0f4c68..27928ae3be1 100644 --- a/release/scripts/startup/bl_ui/space_graph.py +++ b/release/scripts/startup/bl_ui/space_graph.py @@ -125,6 +125,7 @@ class GRAPH_MT_view(Menu): layout.separator() layout.operator("graph.view_all") layout.operator("graph.view_selected") + layout.operator("graph.view_frame") layout.separator() layout.operator("screen.area_dupli") -- cgit v1.2.3 From e6ceecdf97f927a497d567f0f271d2c51964d193 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 22 Apr 2015 16:26:00 +1000 Subject: Cleanup: pep8, spelling --- release/scripts/startup/bl_ui/space_graph.py | 1 + 1 file changed, 1 insertion(+) (limited to 'release/scripts/startup/bl_ui/space_graph.py') diff --git a/release/scripts/startup/bl_ui/space_graph.py b/release/scripts/startup/bl_ui/space_graph.py index 27928ae3be1..2f5381e58c8 100644 --- a/release/scripts/startup/bl_ui/space_graph.py +++ b/release/scripts/startup/bl_ui/space_graph.py @@ -281,6 +281,7 @@ class GRAPH_MT_key_transform(Menu): layout.operator("transform.rotate", text="Rotate") layout.operator("transform.resize", text="Scale") + class GRAPH_MT_delete(Menu): bl_label = "Delete" -- cgit v1.2.3