griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

If Images have relative path, and come from a library, it uses the library

Browse Source 
path as reference for loading the image.
This commit is contained in:
Ton Roosendaal
2006-02-02 18:28:01 +00:00
parent f493e8ed2e
commit 2a528b285e
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/blenkernel/intern/image.c
View File

@@ -491,6 +491,8 @@ void load_image(Image * ima, int flags, char *relabase, int framenum)
{
char name[FILE_MAXDIR + FILE_MAXFILE];
if(ima->id.lib) relabase= ima->id.lib->filename;
if (ima->ibuf == NULL) {
// is there a PackedFile with this image ?;
@@ -578,7 +580,10 @@ void ima_ibuf_is_nul(Tex *tex, Image *ima)
if(ima==0) return;
strcpy(str, ima->name);
BLI_convertstringcode(str, G.sce, G.scene->r.cfra);
if(ima->id.lib)
BLI_convertstringcode(str, ima->id.lib->filename, G.scene->r.cfra);
else
BLI_convertstringcode(str, G.sce, G.scene->r.cfra);
if(tex->imaflag & TEX_STD_FIELD) de_interlacefunc= de_interlace_st;
else de_interlacefunc= de_interlace_ng;