[Bf-blender-cvs] [7e6e1537991] greasepencil-refactor: Merge branch 'greasepencil-object' into greasepencil-refactor

[Antonio Vazquez]

Commit: 7e6e153799153b4ccb1018a1ba71c1f29b9774f8
Author: Antonio Vazquez
Date:   Mon Dec 16 10:56:05 2019 +0100
Branches: greasepencil-refactor
https://developer.blender.org/rB7e6e153799153b4ccb1018a1ba71c1f29b9774f8

Merge branch 'greasepencil-object' into greasepencil-refactor

 Conflicts:
	release/scripts/startup/bl_ui/properties_grease_pencil_common.py
	release/scripts/startup/bl_ui/space_view3d_toolbar.py

===================================================================



===================================================================

diff --cc release/scripts/startup/bl_ui/properties_grease_pencil_common.py
index 0014b9dad32,fb4e66e5dc5..8c09f5cd011
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@@ -694,9 -641,13 +641,9 @@@ class GreasePencilMaterialsPanel
  
              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 or
 -                        gpcolor.use_stroke_texture_mix
 -                ):
 +                if gpcolor.stroke_style == 'SOLID':
                      row = layout.row()
-                     row.prop(gpcolor, "color", text="Stroke Base Color")
+                     row.prop(gpcolor, "color", text="Stroke Color")
  
          else:
              space = context.space_data