[Bf-blender-cvs] [c09fe51f9d3] greasepencil-object: GP Branch Version Patching - Use palette slots instead of creating palettes directly

[Joshua Leung]

Commit: c09fe51f9d369cfa44b5fa77a4b2407ae19490b3
Author: Joshua Leung
Date:   Fri Oct 6 19:24:36 2017 +1300
Branches: greasepencil-object
https://developer.blender.org/rBc09fe51f9d369cfa44b5fa77a4b2407ae19490b3

GP Branch Version Patching - Use palette slots instead of creating palettes directly

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

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

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

diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index f12f86e0c40..9a093e069f0 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -407,13 +407,13 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *main)
 				Palette *first = NULL;
 				for (bGPDpalette *oldpalette = gpd->palettes.first; oldpalette; oldpalette = oldpalette->next) {
 					/* create palette */
-					Palette *newpalette = BKE_palette_add(main, oldpalette->info);
+					bGPDpaletteref *palslot = BKE_gpencil_paletteslot_addnew(main, gpd, oldpalette->info);
+					Palette *newpalette = palslot->palette;
+					
 					/* save first to use later */
 					if (first == NULL) {
 						first = newpalette;
 					}
-					/* enable fake user by default */
-					id_fake_user_set(&newpalette->id);
 
 					for (bGPDpalettecolor *oldcolor = oldpalette->colors.first; oldcolor; oldcolor = oldcolor->next) {
 						PaletteColor *newcolor = BKE_palette_color_add_name(newpalette, oldcolor->info);