[Bf-blender-cvs] [520afa2962] master: GPencil: Fix unreported animation data missing when change palette name
Antonio Vazquez
noreply at git.blender.org
Tue Jan 24 09:16:09 CET 2017
Commit: 520afa2962f1fc97a04f81a5f6a423dd71cf30f3
Author: Antonio Vazquez
Date: Tue Jan 24 09:15:41 2017 +0100
Branches: master
https://developer.blender.org/rB520afa2962f1fc97a04f81a5f6a423dd71cf30f3
GPencil: Fix unreported animation data missing when change palette name
When a palette was renamed, the animation data was not changed.
This fix is related to commit 196520fe7d81
===================================================================
M source/blender/makesrna/intern/rna_gpencil.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c
index 25cd7265c3..6e0d6ad2bc 100644
--- a/source/blender/makesrna/intern/rna_gpencil.c
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@ -784,11 +784,16 @@ static void rna_GPencilPalette_info_set(PointerRNA *ptr, const char *value)
bGPdata *gpd = ptr->id.data;
bGPDpalette *palette = ptr->data;
+ char oldname[64] = "";
+ BLI_strncpy(oldname, palette->info, sizeof(oldname));
+
/* copy the new name into the name slot */
BLI_strncpy_utf8(palette->info, value, sizeof(palette->info));
BLI_uniquename(&gpd->palettes, palette, DATA_("GP_Palette"), '.', offsetof(bGPDpalette, info),
sizeof(palette->info));
+ /* now fix animation paths */
+ BKE_animdata_fix_paths_rename_all(&gpd->id, "palettes", oldname, palette->info);
}
static char *rna_GPencilPalette_path(PointerRNA *ptr)
More information about the Bf-blender-cvs
mailing list