diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-06-12 16:09:33 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-06-12 16:12:36 +0300 |
| commit | 0f4f4d87542b96942234e10421823dcc6766331c (patch) | |
| tree | fd545e6a4ed9ad0652e7e7e18fb76a9e1324e748 /release/scripts/startup/bl_ui/properties_material.py | |
| parent | f52dc2f371923c22a974df7105245f7e0b8148ee (diff) | |
| parent | d8957e4ccec4cda1cd72e94045efba6ab2ceb6fd (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_material.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_material.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/properties_material.py b/release/scripts/startup/bl_ui/properties_material.py index efdd22c5d0c..2feb60f3bfa 100644 --- a/release/scripts/startup/bl_ui/properties_material.py +++ b/release/scripts/startup/bl_ui/properties_material.py @@ -124,9 +124,10 @@ class MATERIAL_PT_context_material(MaterialButtonsPanel, Panel): ob = context.object slot = context.material_slot space = context.space_data - is_sortable = (len(ob.material_slots) > 1) if ob: + is_sortable = (len(ob.material_slots) > 1) + rows = 1 if is_sortable: rows = 4 |