Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Riakiotakis <kalast@gmail.com>2015-04-09 19:29:58 +0300
committerAntony Riakiotakis <kalast@gmail.com>2015-04-09 19:30:14 +0300
commit851ea206d05b4d91423bc754ab2cc4bb0d1f6f38 (patch)
tree1ed416c189aa41c5d1f9e71b00855e514f343e2f /release/scripts
parentcca4405437363bd1cb3d8ee9a77691fd8225d76f (diff)
Separate proportional editing options for graph and action editor.
Diffstat (limited to 'release/scripts')
-rw-r--r--release/scripts/startup/bl_ui/space_dopesheet.py8
-rw-r--r--release/scripts/startup/bl_ui/space_graph.py9
2 files changed, 11 insertions, 6 deletions
diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py
index 843cf41b07c..799431118fb 100644
--- a/release/scripts/startup/bl_ui/space_dopesheet.py
+++ b/release/scripts/startup/bl_ui/space_dopesheet.py
@@ -135,9 +135,11 @@ class DOPESHEET_HT_header(Header):
dopesheet_filter(layout, context, genericFiltersOnly=True)
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_action",
+ text="", icon_only=True)
+ if toolsettings.use_proportional_action:
+ row.prop(toolsettings, "proportional_edit_falloff",
+ text="", icon_only=True)
# Grease Pencil mode doesn't need snapping, as it's frame-aligned only
if st.mode != 'GPENCIL':
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)