Revision: 40854
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40854
Author: campbellbarton
Date: 2011-10-08 11:11:54 +0000 (Sat, 08 Oct 2011)
Log Message:
-----------
use newly added ID_BLEND_PATH() in more places.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/customdata.c
trunk/blender/source/blender/blenkernel/intern/image.c
trunk/blender/source/blender/blenkernel/intern/sound.c
trunk/blender/source/blender/python/generic/bpy_internal_import.c
Modified: trunk/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/customdata.c 2011-10-08
11:02:58 UTC (rev 40853)
+++ trunk/blender/source/blender/blenkernel/intern/customdata.c 2011-10-08
11:11:54 UTC (rev 40854)
@@ -2383,10 +2383,8 @@
static void customdata_external_filename(char filename[FILE_MAX], ID *id,
CustomDataExternal *external)
{
- char *path = (id->lib)? id->lib->filepath: G.main->name;
-
BLI_strncpy(filename, external->filename, FILE_MAX);
- BLI_path_abs(filename, path);
+ BLI_path_abs(filename, ID_BLEND_PATH(G.main, id));
}
void CustomData_external_reload(CustomData *data, ID *UNUSED(id),
CustomDataMask mask, int totelem)
Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c 2011-10-08
11:02:58 UTC (rev 40853)
+++ trunk/blender/source/blender/blenkernel/intern/image.c 2011-10-08
11:11:54 UTC (rev 40854)
@@ -1653,10 +1653,7 @@
BLI_stringdec(name, head, tail, &numlen);
BLI_stringenc(name, head, tail, numlen, frame);
- if(ima->id.lib)
- BLI_path_abs(name, ima->id.lib->filepath);
- else
- BLI_path_abs(name, G.main->name);
+ BLI_path_abs(name, ID_BLEND_PATH(G.main, &ima->id));
flag= IB_rect|IB_multilayer;
if(ima->flag & IMA_DO_PREMUL)
@@ -1768,11 +1765,8 @@
char str[FILE_MAX];
BLI_strncpy(str, ima->name, FILE_MAX);
- if(ima->id.lib)
- BLI_path_abs(str, ima->id.lib->filepath);
- else
- BLI_path_abs(str, G.main->name);
-
+ BLI_path_abs(str, ID_BLEND_PATH(G.main, &ima->id));
+
/* FIXME: make several stream accessible in image editor, too*/
ima->anim = openanim(str, IB_rect, 0);
@@ -1834,10 +1828,7 @@
/* get the right string */
BLI_strncpy(str, ima->name, sizeof(str));
- if(ima->id.lib)
- BLI_path_abs(str, ima->id.lib->filepath);
- else
- BLI_path_abs(str, G.main->name);
+ BLI_path_abs(str, ID_BLEND_PATH(G.main, &ima->id));
/* read ibuf */
ibuf = IMB_loadiffname(str, flag);
Modified: trunk/blender/source/blender/blenkernel/intern/sound.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sound.c 2011-10-08
11:02:58 UTC (rev 40853)
+++ trunk/blender/source/blender/blenkernel/intern/sound.c 2011-10-08
11:11:54 UTC (rev 40854)
@@ -340,21 +340,14 @@
#endif
{
char fullpath[FILE_MAX];
- char *path;
/* load sound */
PackedFile* pf = sound->packedfile;
/* dont modify soundact->sound->name, only change a
copy */
BLI_strncpy(fullpath, sound->name, sizeof(fullpath));
+ BLI_path_abs(fullpath, ID_BLEND_PATH(bmain,
&sound->id));
- if(sound->id.lib)
- path = sound->id.lib->filepath;
- else
- path = bmain->name;
-
- BLI_path_abs(fullpath, path);
-
/* but we need a packed file then */
if (pf)
sound->handle = AUD_loadBuffer((unsigned char*)
pf->data, pf->size);
Modified: trunk/blender/source/blender/python/generic/bpy_internal_import.c
===================================================================
--- trunk/blender/source/blender/python/generic/bpy_internal_import.c
2011-10-08 11:02:58 UTC (rev 40853)
+++ trunk/blender/source/blender/python/generic/bpy_internal_import.c
2011-10-08 11:11:54 UTC (rev 40854)
@@ -93,7 +93,7 @@
/* returns a dummy filename for a textblock so we can tell what file a text
block comes from */
void bpy_text_filename_get(char *fn, size_t fn_len, Text *text)
{
- BLI_snprintf(fn, fn_len, "%s%c%s", text->id.lib ?
text->id.lib->filepath : bpy_import_main->name, SEP, text->id.name+2);
+ BLI_snprintf(fn, fn_len, "%s%c%s", ID_BLEND_PATH(bpy_import_main,
&text->id), SEP, text->id.name+2);
}
PyObject *bpy_text_import(Text *text)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
