Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v2.83-release'

Browse Source
This commit is contained in:
Philipp Oeser
2020-05-26 14:24:50 +02:00
parent 23520cbd13 2a692e05c8
commit e790f1a8dc
22 changed files with 237 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
release/scripts/startup/bl_ui/space_userpref.py
View File

@@ -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)

2
release/scripts/startup/bl_ui/space_view3d.py
View File

@@ -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')