Merge branch 'blender-v2.83-release'
This commit is contained in:
commit
299682bde7
|
@ -612,7 +612,7 @@ class GreasePencilMaterialsPanel:
|
|||
if is_view3d and brush is not None:
|
||||
gp_settings = brush.gpencil_settings
|
||||
if gp_settings.use_material_pin is False:
|
||||
if ob.active_material_index >= 0:
|
||||
if len(ob.material_slots) > 0 and ob.active_material_index >= 0:
|
||||
ma = ob.material_slots[ob.active_material_index].material
|
||||
else:
|
||||
ma = gp_settings.material
|
||||
|
|
Loading…
Reference in New Issue