[Bf-blender-cvs] [d5a65688165] greasepencil-object: Fix link Palette error with textures
Antonio Vazquez
noreply at git.blender.org
Sat Mar 17 17:01:18 CET 2018
Commit: d5a65688165b455305f0cc7136d2cfcbbe4ff660
Author: Antonio Vazquez
Date: Sat Mar 17 17:01:10 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rBd5a65688165b455305f0cc7136d2cfcbbe4ff660
Fix link Palette error with textures
The link was not loading the referenced images.
===================================================================
M source/blender/blenloader/intern/readfile.c
===================================================================
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 8861722612c..77f0b7e6c6f 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -10281,8 +10281,17 @@ static void expand_gpencil(FileData *fd, Main *mainvar, bGPdata *gpd)
static void expand_palette(FileData *fd, Main *mainvar, Palette *palette)
{
- if (palette->adt)
+ if (palette->adt) {
expand_animdata(fd, mainvar, palette->adt);
+ }
+ for (PaletteColor *palcolor = palette->colors.first; palcolor; palcolor = palcolor->next) {
+ if (palcolor->sima) {
+ expand_doit(fd, mainvar, palcolor->sima);
+ }
+ if (palcolor->ima) {
+ expand_doit(fd, mainvar, palcolor->ima);
+ }
+ }
}
static void expand_workspace(FileData *fd, Main *mainvar, WorkSpace *workspace)
More information about the Bf-blender-cvs
mailing list