Commit: 2ada9c5bc8fae90315ad79d05a68c8ddf09cb5c8
Author: Dalai Felinto
Date: Fri Mar 8 16:48:11 2019 -0300
Branches: master
https://developer.blender.org/rB2ada9c5bc8fae90315ad79d05a68c8ddf09cb5c8
Final fix for greasepencil materials assign/select/deselect in edit mode
===================================================================
M release/scripts/startup/bl_ui/properties_grease_pencil_common.py
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
index 6b3660d85c6..68d1c179462 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -862,11 +862,6 @@ class GreasePencilMaterialsPanel:
show_full_ui = (self.bl_space_type == 'PROPERTIES')
ob = context.object
- if hasattr(context, "gpencil"):
- gpd = context.gpencil
- else:
- gpd = context.gpencil_data
-
row = layout.row()
if ob:
@@ -904,7 +899,7 @@ class GreasePencilMaterialsPanel:
icon_link = 'MESH_DATA' if slot.link == 'DATA' else
'OBJECT_DATA'
row.prop(slot, "link", icon=icon_link, icon_only=True)
- if gpd and gpd.use_stroke_edit_mode:
+ if ob.data.use_stroke_edit_mode:
row = layout.row(align=True)
row.operator("gpencil.stroke_change_color", text="Assign")
row.operator("gpencil.color_select",
text="Select").deselect = False
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
