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

Fix missed materials after append GP object

Browse Source
This commit is contained in:
Antonio Vazquez
2018-07-04 12:51:07 +02:00
parent ecb4a65460
commit b6776304e7
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/blenloader/intern/readfile.c
View File

@@ -4175,6 +4175,16 @@ static void direct_link_material(FileData *fd, Material *ma)
BLI_listbase_clear(&ma->gpumaterial);
ma->gp_style = newdataadr(fd, ma->gp_style);
/* relink grease pencil settings */
if (ma->gp_style != NULL) {
MaterialGPencilStyle *gp_style = ma->gp_style;
if (gp_style->sima != NULL) {
gp_style->sima = newlibadr_us(fd, ma->id.lib, gp_style->sima);
}
if (gp_style->ima != NULL) {
gp_style->ima = newlibadr_us(fd, ma->id.lib, gp_style->ima);
}
}
}
/* ************ READ PARTICLE SETTINGS ***************** */
@@ -9954,6 +9964,10 @@ static void expand_gpencil(FileData *fd, Main *mainvar, bGPdata *gpd)
expand_doit(fd, mainvar, gpl->parent);
}
for (int a = 0; a < gpd->totcol; a++) {
expand_doit(fd, mainvar, gpd->mat[a]);
}
}
static void expand_workspace(FileData *fd, Main *mainvar, WorkSpace *workspace)