[Bf-blender-cvs] [c1cd7221718] greasepencil-object: Fix assert error linking palettes

[Antonio Vazquez]

Commit: c1cd7221718047b9fc8c7e61e9fc5a9a375d533b
Author: Antonio Vazquez
Date:   Wed Mar 14 19:44:09 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rBc1cd7221718047b9fc8c7e61e9fc5a9a375d533b

Fix assert error linking palettes

Must check if the hash key was inserted before.

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

M	source/blender/blenloader/intern/readfile.c

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

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 04970a54133..4a5d1674800 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -6643,7 +6643,9 @@ static void lib_link_gpencil(FileData *fd, Main *main)
 	for (Palette *palette = main->palettes.first; palette; palette = palette->id.next, i++) {
 		gp_palettecolors_buffer[i] = BLI_ghash_str_new("GPencil Hash Colors");
 		for (PaletteColor *palcolor = palette->colors.first; palcolor; palcolor = palcolor->next) {
-			BLI_ghash_insert(gp_palettecolors_buffer[i], palcolor->info, palcolor);
+			if (BLI_ghash_lookup(gp_palettecolors_buffer[i], palcolor->info) == NULL) {
+				BLI_ghash_insert(gp_palettecolors_buffer[i], palcolor->info, palcolor);
+			}
 		}
 	}