diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2020-05-26 15:24:50 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2020-05-26 15:24:50 +0300 |
| commit | e790f1a8dc18cdc2906d2cf415271b1d91baca14 (patch) | |
| tree | 0c70fe0cacddbf49f196fd54cfefec7d76178289 /release | |
| parent | 23520cbd13798b1d9db738f76012e91b3ce85c85 (diff) | |
| parent | 2a692e05c872e603bd7089b021c2e49edec6290a (diff) | |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_userpref.py | 1 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 3baedd889e0..5a36f6bb081 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -1631,7 +1631,6 @@ class USERPREF_PT_ndof_settings(Panel): layout.use_property_decorate = False # No animation. input_prefs = context.preferences.inputs - is_view3d = context.space_data.type == 'VIEW_3D' self.draw_settings(layout, input_prefs, is_view3d) diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 98c5bd944c3..488b4a99fc1 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -431,7 +431,7 @@ class _draw_tool_settings_context_mode: row.prop(gp_settings, "use_material_pin", text="") - if brush.gpencil_tool in {'DRAW', 'FILL'} and ma: + if brush.gpencil_tool in {'DRAW', 'FILL'}: row.separator(factor=1.0) subrow = row.row(align=True) row.prop_enum(settings, "color_mode", 'MATERIAL', text="", icon='MATERIAL') |