[Bf-blender-cvs] [e317484d00e] greasepencil-object: GPencil: Replace default palette to Krita colors

[Antonio Vazquez]

Commit: e317484d00e69e8763013943c39aa230d72aa042
Author: Antonio Vazquez
Date:   Mon Nov 4 20:15:40 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rBe317484d00e69e8763013943c39aa230d72aa042

GPencil: Replace default palette to Krita colors

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

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

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

diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index 9c4eb912c2f..38186b87aac 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -3115,22 +3115,22 @@ void BKE_gpencil_convert_curve(Main *bmain,
 /* Create a default palette */
 void BKE_gpencil_palette_ensure(Main *bmain, Scene *scene)
 {
-  const int totcol = 122;
+  const int totcol = 120;
   static char *hexcol[] = {
-      "FF0000", "FFFF00", "00FF00", "00FFFF", "0000FF", "FF00FF", "FFFFFF", "E5E5E5", "D9D9D9",
-      "CCCCCC", "BFBFBF", "B2B2B2", "A6A6A6", "999999", "8C8C8C", "808080", "FF0000", "FFFF00",
-      "00FF00", "00FFFF", "0000FF", "FF00FF", "737373", "666666", "595959", "4C4C4C", "404040",
-      "33333",  "262626", "191919", "0D0D0D", "000000", "FF8080", "FF9E80", "FFBF80", "FFFF80",
-      "BFFF80", "9EFF80", "80FF80", "80FFBF", "80FFFF", "80BFFF", "809EFF", "8080FF", "9E80FF",
-      "BF80FF", "FF80FF", "FF80BF", "FF4747", "FF7547", "FFA347", "FFFF47", "A3FF47", "75FF47",
-      "47FF47", "47FFA3", "47FFFF", "47A3FF", "4775FF", "4747FF", "7547FF", "A347FF", "FF47FF",
-      "FF47A3", "FF0000", "FF4000", "FF8000", "FFFF00", "80FF00", "40FF00", "00FF00", "00FF80",
-      "00FFFF", "0080FF", "0040FF", "0000FF", "4000FF", "8000FF", "FF00FF", "FF0080", "990000",
-      "992600", "994D00", "999900", "4D9900", "269900", "009900", "00994D", "009999", "004D99",
-      "002699", "000099", "260099", "4D0099", "990099", "99004D", "660000", "661900", "663300",
-      "666600", "336600", "196600", "006600", "006633", "006666", "003366", "001966", "000066",
-      "190066", "330066", "660066", "660033", "BFA88F", "8E7E6D", "635A4F", "3F3A36", "202020",
-      "BF8F60", "9D6F42", "7F5428", "643B12", "4D2600"};
+      "FFFFFF", "F2F2F2", "E6E6E6", "D9D9D9", "CCCCCC", "BFBFBF", "B2B2B2", "A6A6A6", "999999",
+      "8C8C8C", "808080", "737373", "666666", "595959", "4C4C4C", "404040", "333333", "262626",
+      "1A1A1A", "000000", "F2FC24", "FFEA00", "FEA711", "FE8B68", "FB3B02", "FE3521", "D00000",
+      "A81F3D", "780422", "2B0000", "F1E2C5", "FEE4B3", "FEDABB", "FEC28E", "D88F57", "BD6340",
+      "A2402B", "63352D", "6B2833", "34120C", "E7CB8F", "D1B38B", "C1B17F", "D7980B", "FFB100",
+      "FE8B00", "FF6A00", "B74100", "5F3E1D", "3B2300", "FECADA", "FE65CB", "FE1392", "DD3062",
+      "C04A6D", "891688", "4D2689", "441521", "2C1139", "241422", "FFFF7D", "FFFF00", "FF7F00",
+      "FF7D7D", "FF7DFF", "FF00FE", "FF007F", "FF0000", "7F0000", "0A0A00", "F6FDFF", "E9F7FF",
+      "CFE6FE", "AAC7FE", "77B3FE", "1E74FD", "0046AA", "2F4476", "003052", "0E0E25", "EEF5F0",
+      "D6E5DE", "ACD8B9", "6CADC6", "42A9AF", "007F7F", "49675C", "2E4E4E", "1D3239", "0F1C21",
+      "D8FFF4", "B8F4F5", "AECCB5", "76C578", "358757", "409B68", "468768", "1F512B", "2A3C37",
+      "122E1D", "EFFFC9", "E6F385", "BCF51C", "D4DC18", "82D322", "5C7F00", "59932B", "297F00",
+      "004320", "1C3322", "00FF7F", "00FF00", "7DFF7D", "7DFFFF", "00FFFF", "7D7DFF", "7F00FF",
+      "0000FF", "3F007F", "00007F"};
 
   ToolSettings *ts = scene->toolsettings;
   GpPaint *gp_paint = ts->gp_paint;