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_topbar.py | |
| parent | 7fac1bfc203198583eb2e65caedec6b32c24484f (diff) | |
| parent | 42b9df5907d041a5a68585308b1e11b2eac2c947 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release/scripts/startup/bl_ui/space_topbar.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_topbar.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py index 0f8aaa89667..ee5bdb38db7 100644 --- a/release/scripts/startup/bl_ui/space_topbar.py +++ b/release/scripts/startup/bl_ui/space_topbar.py @@ -110,7 +110,7 @@ class TOPBAR_HT_lower_bar(Header): # Object Mode Options # ------------------- - # Example of how toolsettings can be accessed as pop-overs. + # Example of how tool_settings can be accessed as pop-overs. # TODO(campbell): editing options should be after active tool options # (obviously separated for from the users POV) @@ -339,8 +339,8 @@ class _draw_left_context_mode: row.prop(gp_settings, "use_material_pin", text="") row = layout.row(align=True) - ts = context.scene.tool_settings - settings = ts.gpencil_paint + tool_settings = context.scene.tool_settings + settings = tool_settings.gpencil_paint row.template_ID_preview(settings, "brush", rows=3, cols=8, hide_buttons=True) if brush.gpencil_tool == 'ERASE': |