[Bf-blender-cvs] [d23869eefab] master: GPencil: Add stroke color to Materials Popover
Antonioya
noreply at git.blender.org
Fri May 3 18:43:19 CEST 2019
Commit: d23869eefab23c229db9c0dae0db062f7cd205f7
Author: Antonioya
Date: Fri May 3 18:43:11 2019 +0200
Branches: master
https://developer.blender.org/rBd23869eefab23c229db9c0dae0db062f7cd205f7
GPencil: Add stroke color to Materials Popover
This makes more easy to manage the color, specially for advanced brushes with pinned materials.
Reviewers: @pepeland, @mendio
===================================================================
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 734828bceaa..05a8735fc2f 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -881,6 +881,22 @@ class GreasePencilMaterialsPanel:
row.operator("gpencil.stroke_change_color", text="Assign")
row.operator("gpencil.color_select", text="Select").deselect = False
row.operator("gpencil.color_select", text="Deselect").deselect = True
+ # stroke color
+ ma = None
+ if is_view3d and brush is not None:
+ gp_settings = brush.gpencil_settings
+ if gp_settings.use_material_pin is False:
+ ma = ob.material_slots[ob.active_material_index].material
+ else:
+ ma = gp_settings.material
+
+ if ma is not None and ma.grease_pencil is not None:
+ gpcolor = ma.grease_pencil
+ if gpcolor.stroke_style == 'SOLID' or \
+ gpcolor.use_stroke_pattern is True or \
+ gpcolor.use_stroke_texture_mix is True:
+ row = layout.row()
+ row.prop(gpcolor, "color", text="Stroke Color")
else:
space = context.space_data
More information about the Bf-blender-cvs
mailing list