Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-01-15 20:17:53 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-01-15 20:54:11 +0300
commitb1fa2a8fbbd9d17da7e1fea8afd29055f47113c8 (patch)
tree964af322d2f74961de27892b7a5feb465a4d1ec4 /release
parenteb61e6840efc1323bc021b44f1bb0f958b3f71b8 (diff)
Fix T59826: grease pencil crash with empty material slot.
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/space_view3d.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 5c2cf8d529f..a6002dfaad4 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -3892,7 +3892,8 @@ class VIEW3D_MT_assign_material(Menu):
for slot in ob.material_slots:
mat = slot.material
- layout.operator("gpencil.stroke_change_color", text=mat.name).material = mat.name
+ if mat:
+ layout.operator("gpencil.stroke_change_color", text=mat.name).material = mat.name
class VIEW3D_MT_gpencil_copy_layer(Menu):