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:
authorCampbell Barton <ideasman42@gmail.com>2018-12-17 09:26:47 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-12-17 09:32:42 +0300
commit8ec7429a70cca85dd3bc7f29f1ac5030aec7054f (patch)
tree34c1e703cdb3998f8ae5d3d0f2340afa828327a5 /release/scripts/startup/bl_ui/space_sequencer.py
parent7fac1bfc203198583eb2e65caedec6b32c24484f (diff)
parent42b9df5907d041a5a68585308b1e11b2eac2c947 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'release/scripts/startup/bl_ui/space_sequencer.py')
-rw-r--r--release/scripts/startup/bl_ui/space_sequencer.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py
index 199b1f98fa9..adac167a06d 100644
--- a/release/scripts/startup/bl_ui/space_sequencer.py
+++ b/release/scripts/startup/bl_ui/space_sequencer.py
@@ -121,14 +121,14 @@ class SEQUENCER_HT_header(Header):
if st.view_type in {'PREVIEW', 'SEQUENCER_PREVIEW'}:
gpd = context.gpencil_data
- toolsettings = context.tool_settings
+ tool_settings = context.tool_settings
# Proportional editing
if gpd and gpd.use_stroke_edit_mode:
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(tool_settings, "proportional_edit", icon_only=True)
+ if tool_settings.proportional_edit != 'DISABLED':
+ row.prop(tool_settings, "proportional_edit_falloff", icon_only=True)
class SEQUENCER_MT_editor_menus(Menu):