[Bf-blender-cvs] [7335e091293] greasepencil-object: Add default grey color with fill to default Palette

[Antonio Vazquez]

Commit: 7335e09129343d3e8594848f2eec53eb5d0b01ab
Author: Antonio Vazquez
Date:   Sat Dec 9 17:02:35 2017 +0100
Branches: greasepencil-object
https://developer.blender.org/rB7335e09129343d3e8594848f2eec53eb5d0b01ab

Add default grey color with fill to default Palette

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

M	source/blender/blenkernel/intern/paint.c

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

diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c
index 4b6082bfc02..cb4be979f75 100644
--- a/source/blender/blenkernel/intern/paint.c
+++ b/source/blender/blenkernel/intern/paint.c
@@ -532,6 +532,10 @@ void BKE_palette_color_add_default_set(Palette *palette)
 
 	palcolor = BKE_palette_color_add_name(palette, "Blue");
 	ARRAY_SET_ITEMS(palcolor->rgb, 0.0, 0.0, 1.0, 1.0);
+
+	palcolor = BKE_palette_color_add_name(palette, "Grey");
+	ARRAY_SET_ITEMS(palcolor->fill, 0.6, 0.6, 0.6, 0.9);
+	ARRAY_SET_ITEMS(palcolor->rgb, 0.4, 0.4, 0.4, 1.0);
 }
 
 PaletteColor *BKE_palette_color_copy(Palette *palette, PaletteColor *palcolor)