diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-12-17 09:26:47 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-17 09:32:42 +0300 |
commit | 8ec7429a70cca85dd3bc7f29f1ac5030aec7054f (patch) | |
tree | 34c1e703cdb3998f8ae5d3d0f2340afa828327a5 /release/scripts/startup/bl_ui/space_dopesheet.py | |
parent | 7fac1bfc203198583eb2e65caedec6b32c24484f (diff) | |
parent | 42b9df5907d041a5a68585308b1e11b2eac2c947 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release/scripts/startup/bl_ui/space_dopesheet.py')
-rw-r--r-- | release/scripts/startup/bl_ui/space_dopesheet.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py index b57a0b69539..f35dea67854 100644 --- a/release/scripts/startup/bl_ui/space_dopesheet.py +++ b/release/scripts/startup/bl_ui/space_dopesheet.py @@ -237,7 +237,7 @@ class DOPESHEET_HT_editor_buttons(Header): @staticmethod def draw_header(context, layout): st = context.space_data - toolsettings = context.tool_settings + tool_settings = context.tool_settings if st.mode in {'ACTION', 'SHAPEKEY'}: # TODO: These buttons need some tidying up - Probably by using a popover, and bypassing the template_id() here @@ -284,10 +284,10 @@ class DOPESHEET_HT_editor_buttons(Header): layout.prop(st, "auto_snap", text="") row = layout.row(align=True) - row.prop(toolsettings, "use_proportional_action", text="", icon_only=True) + row.prop(tool_settings, "use_proportional_action", text="", icon_only=True) sub = row.row(align=True) - sub.active = toolsettings.use_proportional_action - sub.prop(toolsettings, "proportional_edit_falloff", text="", icon_only=True) + sub.active = tool_settings.use_proportional_action + sub.prop(tool_settings, "proportional_edit_falloff", text="", icon_only=True) class DOPESHEET_MT_editor_menus(Menu): |