[Bf-blender-cvs] [527d9c7295a] greasepencil-object: Fix missing library Palette relink

[Antonio Vazquez]

Commit: 527d9c7295a0f00090a68aed1c573fa846ce2a01
Author: Antonio Vazquez
Date:   Thu Apr 19 17:02:39 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB527d9c7295a0f00090a68aed1c573fa846ce2a01

Fix missing library Palette relink

The palette pointer was not relink as expected for Brushes and GP strokes.

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

M	release/datafiles/locale
M	release/scripts/addons
M	release/scripts/addons_contrib
M	source/blender/blenkernel/intern/library_query.c
M	source/tools

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

diff --git a/release/datafiles/locale b/release/datafiles/locale
index d3349b42856..c93ed11a47b 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit d3349b42856d00c278f72f2a5909a6c96b9cdb5e
+Subproject commit c93ed11a47b3016cf59711ec16de2e2e94c30e99
diff --git a/release/scripts/addons b/release/scripts/addons
index f8a43cda938..371960484a3 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit f8a43cda938c0e037c084f15d410d18dabc31b60
+Subproject commit 371960484a38fc64e0a2635170a41a0d8ab2f6bd
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 34a27a42d78..a8515cfdfe9 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 34a27a42d781d80f9f1833bad8cc5b2abcac2933
+Subproject commit a8515cfdfe9a98127b592f36fcbe51b7e23b969a
diff --git a/source/blender/blenkernel/intern/library_query.c b/source/blender/blenkernel/intern/library_query.c
index 0047ff889ff..340483d776c 100644
--- a/source/blender/blenkernel/intern/library_query.c
+++ b/source/blender/blenkernel/intern/library_query.c
@@ -777,6 +777,7 @@ void BKE_library_foreach_ID_link(Main *bmain, ID *id, LibraryIDLinkCallback call
 				CALLBACK_INVOKE(brush->toggle_brush, IDWALK_CB_NOP);
 				CALLBACK_INVOKE(brush->clone.image, IDWALK_CB_NOP);
 				CALLBACK_INVOKE(brush->paint_curve, IDWALK_CB_USER);
+			    CALLBACK_INVOKE(brush->palette, IDWALK_CB_USER);
 				library_foreach_mtex(&data, &brush->mtex);
 				library_foreach_mtex(&data, &brush->mask_mtex);
 				break;
@@ -958,8 +959,14 @@ void BKE_library_foreach_ID_link(Main *bmain, ID *id, LibraryIDLinkCallback call
 			{
 				bGPdata *gpencil = (bGPdata *) id;
 
+				/* relink palette for all strokes */
 				for (bGPDlayer *gp_layer = gpencil->layers.first; gp_layer; gp_layer = gp_layer->next) {
 					CALLBACK_INVOKE(gp_layer->parent, IDWALK_CB_NOP);
+					for (bGPDframe *gpf = gp_layer->frames.first; gpf; gpf = gpf->next) {
+						for (bGPDstroke *gps = gpf->strokes.first; gps; gps = gps->next) {
+							CALLBACK_INVOKE(gps->palette, IDWALK_CB_NOP);
+						}
+					}
 				}
 				break;
 			}
diff --git a/source/tools b/source/tools
index 56f3887596b..b11375e8906 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 56f3887596b538a9fc17e0439883f2e2305f2633
+Subproject commit b11375e89061303401376f7aeae42ac2fd64692a