archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

GPencil: Fix unreported error in animation after rename items

Browse Source 
If the layers or the colors were renamed, the animation data was wrong
because the data path was not updated.

I also have fixed a possible stroke color name update if the name was duplicated moving
the rename function call after checking unique name.
This commit is contained in:
Antonio Vazquez
2017-01-18 12:25:49 +01:00
parent d216313732
commit 196520fe7d
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/makesrna/intern/rna_gpencil.c
View File

@@ -31,6 +31,8 @@
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "BKE_animsys.h"
#include "BLI_string_utils.h" #include "BLI_string_utils.h"
#include "BLI_utildefines.h" #include "BLI_utildefines.h"
@@ -353,10 +355,16 @@ static void rna_GPencilLayer_info_set(PointerRNA *ptr, const char *value)
bGPdata *gpd = ptr->id.data; bGPdata *gpd = ptr->id.data;
bGPDlayer *gpl = ptr->data; bGPDlayer *gpl = ptr->data;
char oldname[128] = "";
BLI_strncpy(oldname, gpl->info, sizeof(oldname));
/* copy the new name into the name slot */ /* copy the new name into the name slot */
BLI_strncpy_utf8(gpl->info, value, sizeof(gpl->info)); BLI_strncpy_utf8(gpl->info, value, sizeof(gpl->info));
BLI_uniquename(&gpd->layers, gpl, DATA_("GP_Layer"), '.', offsetof(bGPDlayer, info), sizeof(gpl->info)); BLI_uniquename(&gpd->layers, gpl, DATA_("GP_Layer"), '.', offsetof(bGPDlayer, info), sizeof(gpl->info));
/* now fix animation paths */
BKE_animdata_fix_paths_rename_all(&gpd->id, "layers", oldname, gpl->info);
} }
static void rna_GPencil_use_onion_skinning_set(PointerRNA *ptr, const int value) static void rna_GPencil_use_onion_skinning_set(PointerRNA *ptr, const int value)
@@ -815,13 +823,19 @@ static void rna_GPencilPaletteColor_info_set(PointerRNA *ptr, const char *value)
bGPDpalette *palette = BKE_gpencil_palette_getactive(gpd); bGPDpalette *palette = BKE_gpencil_palette_getactive(gpd);
bGPDpalettecolor *palcolor = ptr->data; bGPDpalettecolor *palcolor = ptr->data;
/* rename all strokes */ char oldname[64] = "";
BKE_gpencil_palettecolor_changename(gpd, palcolor->info, value); BLI_strncpy(oldname, palcolor->info, sizeof(oldname));
/* copy the new name into the name slot */ /* copy the new name into the name slot */
BLI_strncpy_utf8(palcolor->info, value, sizeof(palcolor->info)); BLI_strncpy_utf8(palcolor->info, value, sizeof(palcolor->info));
BLI_uniquename(&palette->colors, palcolor, DATA_("Color"), '.', offsetof(bGPDpalettecolor, info), BLI_uniquename(&palette->colors, palcolor, DATA_("Color"), '.', offsetof(bGPDpalettecolor, info),
sizeof(palcolor->info)); sizeof(palcolor->info));
/* rename all strokes */
BKE_gpencil_palettecolor_changename(gpd, oldname, palcolor->info);
/* now fix animation paths */
BKE_animdata_fix_paths_rename_all(&gpd->id, "colors", oldname, palcolor->info);
} }
static void rna_GPencilStrokeColor_info_set(PointerRNA *ptr, const char *value) static void rna_GPencilStrokeColor_info_set(PointerRNA *ptr, const char *value)