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:
authorDalai Felinto <dfelinto@gmail.com>2019-03-08 22:48:11 +0300
committerDalai Felinto <dfelinto@gmail.com>2019-03-08 22:48:19 +0300
commit2ada9c5bc8fae90315ad79d05a68c8ddf09cb5c8 (patch)
treeaf18c76c84c5710c7c70be111305af571548e412 /release
parent4ccaf56814a1389516dba7b2eb8fde0944dfccd8 (diff)
Final fix for greasepencil materials assign/select/deselect in edit mode
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/properties_grease_pencil_common.py7
1 files changed, 1 insertions, 6 deletions
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