[Bf-blender-cvs] [8dcddbc0912] blender2.8: UI: Annotations tool color setting in toolbar

[Pablo Vazquez]

Commit: 8dcddbc09129140e47855b4a1fe85b3684636586
Author: Pablo Vazquez
Date:   Tue Jul 31 13:08:30 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB8dcddbc09129140e47855b4a1fe85b3684636586

UI: Annotations tool color setting in toolbar

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

M	release/scripts/startup/bl_ui/space_toolsystem_toolbar.py

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

diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index b682588629b..1bb5a93f7f8 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -200,9 +200,10 @@ class _defs_annotate:
 
         if gpd and gpl:
             layout.prop(gpd.layers, "active_note", text="")
-            layout.prop(gpl, "thickness", text="Thickness")
+            layout.prop(gpl, "color", text="")
+            layout.prop(gpl, "thickness")
         else:
-            layout.prop(user_prefs.edit, "grease_pencil_default_color", text="Color")
+            layout.prop(user_prefs.edit, "grease_pencil_default_color", text="")
             layout.prop(ts, "annotation_thickness", text="Thickness")
 
         # For 3D view, show the stroke placement settings