[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27367] trunk/blender/source: rename some functions to use easier to understand names.
Campbell Barton
ideasman42 at gmail.com
Tue Mar 9 18:36:24 CET 2010
Revision: 27367
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27367
Author: campbellbarton
Date: 2010-03-09 18:36:23 +0100 (Tue, 09 Mar 2010)
Log Message:
-----------
rename some functions to use easier to understand names.
'BLI_makestringcode' --> 'BLI_path_rel'
'BLI_convertstringcwd' --> 'BLI_path_cwd'
'BLI_convertstringframe' --> 'BLI_path_frame'
'BLI_convertstringframe_range' --> 'BLI_path_frame_range'
'BLI_make_cwdpath' --> 'BLI_path_cwd'
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/customdata.c
trunk/blender/source/blender/blenkernel/intern/fluidsim.c
trunk/blender/source/blender/blenkernel/intern/image.c
trunk/blender/source/blender/blenkernel/intern/library.c
trunk/blender/source/blender/blenkernel/intern/packedFile.c
trunk/blender/source/blender/blenkernel/intern/particle_system.c
trunk/blender/source/blender/blenkernel/intern/pointcache.c
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/blenkernel/intern/sound.c
trunk/blender/source/blender/blenkernel/intern/text.c
trunk/blender/source/blender/blenkernel/intern/writeavi.c
trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
trunk/blender/source/blender/blenlib/BLI_path_util.h
trunk/blender/source/blender/blenlib/intern/bpath.c
trunk/blender/source/blender/blenlib/intern/path_util.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/collada/DocumentExporter.cpp
trunk/blender/source/blender/editors/interface/interface_draw.c
trunk/blender/source/blender/editors/object/object_modifier.c
trunk/blender/source/blender/editors/physics/physics_fluid.c
trunk/blender/source/blender/editors/screen/screendump.c
trunk/blender/source/blender/editors/space_file/file_ops.c
trunk/blender/source/blender/editors/space_file/filesel.c
trunk/blender/source/blender/editors/space_file/writeimage.c
trunk/blender/source/blender/editors/space_image/image_ops.c
trunk/blender/source/blender/editors/space_outliner/outliner.c
trunk/blender/source/blender/editors/space_text/text_ops.c
trunk/blender/source/blender/makesdna/DNA_space_types.h
trunk/blender/source/blender/makesrna/intern/rna_image_api.c
trunk/blender/source/blender/quicktime/apple/qtkit_export.m
trunk/blender/source/blender/quicktime/apple/quicktime_export.c
trunk/blender/source/blender/render/intern/source/pipeline.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
trunk/blender/source/creator/creator.c
trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
Modified: trunk/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/customdata.c 2010-03-09 16:57:24 UTC (rev 27366)
+++ trunk/blender/source/blender/blenkernel/intern/customdata.c 2010-03-09 17:36:23 UTC (rev 27367)
@@ -2315,7 +2315,7 @@
char *path = (id->lib)? id->lib->filename: G.sce;
BLI_strncpy(filename, external->filename, FILE_MAX);
- BLI_convertstringcode(filename, path);
+ BLI_path_abs(filename, path);
}
void CustomData_external_read(CustomData *data, ID *id, CustomDataMask mask, int totelem)
Modified: trunk/blender/source/blender/blenkernel/intern/fluidsim.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/fluidsim.c 2010-03-09 16:57:24 UTC (rev 27366)
+++ trunk/blender/source/blender/blenkernel/intern/fluidsim.c 2010-03-09 17:36:23 UTC (rev 27367)
@@ -431,8 +431,8 @@
strcat(targetDir,"fluidsurface_final_####");
}
- BLI_convertstringcode(targetDir, G.sce);
- BLI_convertstringframe(targetDir, curFrame, 0); // fixed #frame-no
+ BLI_path_abs(targetDir, G.sce);
+ BLI_path_frame(targetDir, curFrame, 0); // fixed #frame-no
strcpy(targetFile,targetDir);
strcat(targetFile, ".bobj.gz");
Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c 2010-03-09 16:57:24 UTC (rev 27366)
+++ trunk/blender/source/blender/blenkernel/intern/image.c 2010-03-09 17:36:23 UTC (rev 27367)
@@ -391,7 +391,7 @@
}
BLI_strncpy(str, name, sizeof(str));
- BLI_convertstringcode(str, G.sce);
+ BLI_path_abs(str, G.sce);
/* exists? */
file= open(str, O_BINARY|O_RDONLY);
@@ -402,7 +402,7 @@
for(ima= G.main->image.first; ima; ima= ima->id.next) {
if(ima->source!=IMA_SRC_VIEWER && ima->source!=IMA_SRC_GENERATED) {
BLI_strncpy(strtest, ima->name, sizeof(ima->name));
- BLI_convertstringcode(strtest, G.sce);
+ BLI_path_abs(strtest, G.sce);
if( strcmp(strtest, str)==0 ) {
if(ima->anim==NULL || ima->id.us==0) {
@@ -1428,8 +1428,8 @@
{
if (string==NULL) return;
BLI_strncpy(string, base, FILE_MAX - 10); /* weak assumption */
- BLI_convertstringcode(string, G.sce);
- BLI_convertstringframe(string, frame, 4);
+ BLI_path_abs(string, G.sce);
+ BLI_path_frame(string, frame, 4);
if(use_ext)
BKE_add_image_extension(string, imtype);
@@ -1684,9 +1684,9 @@
BLI_strncpy(name, ima->name, sizeof(name));
if(ima->id.lib)
- BLI_convertstringcode(name, ima->id.lib->filename);
+ BLI_path_abs(name, ima->id.lib->filename);
else
- BLI_convertstringcode(name, G.sce);
+ BLI_path_abs(name, G.sce);
/* read ibuf */
ibuf = IMB_loadiffname(name, IB_rect|IB_multilayer);
@@ -1791,9 +1791,9 @@
BLI_strncpy(str, ima->name, FILE_MAX);
if(ima->id.lib)
- BLI_convertstringcode(str, ima->id.lib->filename);
+ BLI_path_abs(str, ima->id.lib->filename);
else
- BLI_convertstringcode(str, G.sce);
+ BLI_path_abs(str, G.sce);
ima->anim = openanim(str, IB_cmap | IB_rect);
@@ -1845,11 +1845,11 @@
/* get the right string */
BLI_strncpy(str, ima->name, sizeof(str));
if(ima->id.lib)
- BLI_convertstringcode(str, ima->id.lib->filename);
+ BLI_path_abs(str, ima->id.lib->filename);
else
- BLI_convertstringcode(str, G.sce);
+ BLI_path_abs(str, G.sce);
- BLI_convertstringframe(str, cfra, 0);
+ BLI_path_frame(str, cfra, 0);
/* read ibuf */
ibuf = IMB_loadiffname(str, IB_rect|IB_multilayer|IB_imginfo);
Modified: trunk/blender/source/blender/blenkernel/intern/library.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/library.c 2010-03-09 16:57:24 UTC (rev 27366)
+++ trunk/blender/source/blender/blenkernel/intern/library.c 2010-03-09 17:36:23 UTC (rev 27367)
@@ -1244,8 +1244,8 @@
{
if(ima->id.lib==NULL) return;
if(strncmp(ima->name, "//", 2)==0) {
- BLI_convertstringcode(ima->name, ima->id.lib->filename);
- BLI_makestringcode(G.sce, ima->name);
+ BLI_path_abs(ima->name, ima->id.lib->filename);
+ BLI_path_rel(ima->name, G.sce);
}
}
Modified: trunk/blender/source/blender/blenkernel/intern/packedFile.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/packedFile.c 2010-03-09 16:57:24 UTC (rev 27366)
+++ trunk/blender/source/blender/blenkernel/intern/packedFile.c 2010-03-09 17:36:23 UTC (rev 27367)
@@ -186,7 +186,7 @@
// convert relative filenames to absolute filenames
strcpy(name, filename);
- BLI_convertstringcode(name, G.sce);
+ BLI_path_abs(name, G.sce);
// open the file
// and create a PackedFile structure
@@ -274,7 +274,7 @@
if (guimode); //XXX waitcursor(1);
strcpy(name, filename);
- BLI_convertstringcode(name, G.sce);
+ BLI_path_abs(name, G.sce);
if (BLI_exists(name)) {
for (number = 1; number <= 999; number++) {
@@ -339,7 +339,7 @@
char name[FILE_MAXDIR + FILE_MAXFILE];
strcpy(name, filename);
- BLI_convertstringcode(name, G.sce);
+ BLI_path_abs(name, G.sce);
if (stat(name, &st)) {
ret_val = PF_NOFILE;
Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c 2010-03-09 16:57:24 UTC (rev 27366)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c 2010-03-09 17:36:23 UTC (rev 27367)
@@ -3567,8 +3567,8 @@
// ok, start loading
strcpy(filename, fss->surfdataPath);
strcat(filename, suffix);
- BLI_convertstringcode(filename, G.sce);
- BLI_convertstringframe(filename, curFrame, 0); // fixed #frame-no
+ BLI_path_abs(filename, G.sce);
+ BLI_path_frame(filename, curFrame, 0); // fixed #frame-no
strcat(filename, suffix2);
gzf = gzopen(filename, "rb");
Modified: trunk/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pointcache.c 2010-03-09 16:57:24 UTC (rev 27366)
+++ trunk/blender/source/blender/blenkernel/intern/pointcache.c 2010-03-09 17:36:23 UTC (rev 27367)
@@ -1064,7 +1064,7 @@
file[i-6] = '\0';
snprintf(filename, MAX_PTCACHE_PATH, "//"PTCACHE_PATH"%s", file); /* add blend file name to pointcache dir */
- BLI_convertstringcode(filename, blendfilename);
+ BLI_path_abs(filename, blendfilename);
return BLI_add_slash(filename); /* new strlen() */
}
Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c 2010-03-09 16:57:24 UTC (rev 27366)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c 2010-03-09 17:36:23 UTC (rev 27367)
@@ -586,7 +586,7 @@
if (seq->type != SEQ_SCENE && seq->type != SEQ_META &&
seq->type != SEQ_IMAGE) {
BLI_join_dirfile(str, seq->strip->dir, seq->strip->stripdata->name);
- BLI_convertstringcode(str, G.sce);
+ BLI_path_abs(str, G.sce);
}
if (seq->type == SEQ_IMAGE) {
@@ -1247,7 +1247,7 @@
if (seq->flag & SEQ_USE_PROXY_CUSTOM_FILE) {
BLI_join_dirfile(name, dir, seq->strip->proxy->file);
- BLI_convertstringcode(name, G.sce);
+ BLI_path_abs(name, G.sce);
return TRUE;
}
@@ -1276,8 +1276,8 @@
render_size);
}
- BLI_convertstringcode(name, G.sce);
- BLI_convertstringframe(name, frameno, 0);
+ BLI_path_abs(name, G.sce);
+ BLI_path_frame(name, frameno, 0);
strcat(name, ".jpg");
@@ -2044,7 +2044,7 @@
if(se->ok == STRIPELEM_OK && se->ibuf == 0) {
StripElem * s_elem = give_stripelem(seq, cfra);
BLI_join_dirfile(name, seq->strip->dir, s_elem->name);
- BLI_convertstringcode(name, G.sce);
+ BLI_path_abs(name, G.sce);
if (!build_proxy_run) {
se->ibuf = seq_proxy_fetch(scene, seq, cfra, render_size);
}
@@ -2078,7 +2078,7 @@
if (se->ibuf == 0) {
if(seq->anim==0) {
BLI_join_dirfile(name, seq->strip->dir, seq->strip->stripdata->name);
- BLI_convertstringcode(name, G.sce);
+ BLI_path_abs(name, G.sce);
seq->anim = openanim(
name, IB_rect |
Modified: trunk/blender/source/blender/blenkernel/intern/sound.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sound.c 2010-03-09 16:57:24 UTC (rev 27366)
+++ trunk/blender/source/blender/blenkernel/intern/sound.c 2010-03-09 17:36:23 UTC (rev 27367)
@@ -127,7 +127,7 @@
int len;
strcpy(str, filename);
- BLI_convertstringcode(str, bmain->name);
+ BLI_path_abs(str, bmain->name);
len = strlen(filename);
while(len > 0 && filename[len-1] != '/' && filename[len-1] != '\\')
@@ -262,7 +262,7 @@
else
path = bmain ? bmain->name : G.sce;
- BLI_convertstringcode(fullpath, path);
+ BLI_path_abs(fullpath, path);
/* but we need a packed file then */
if (pf)
Modified: trunk/blender/source/blender/blenkernel/intern/text.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/text.c 2010-03-09 16:57:24 UTC (rev 27366)
+++ trunk/blender/source/blender/blenkernel/intern/text.c 2010-03-09 17:36:23 UTC (rev 27367)
@@ -246,7 +246,7 @@
if (!text || !text->name) return 0;
BLI_strncpy(str, text->name, FILE_MAXDIR+FILE_MAXFILE);
- BLI_convertstringcode(str, G.sce);
+ BLI_path_abs(str, G.sce);
BLI_split_dirfile(str, NULL, sfile);
fp= fopen(str, "r");
@@ -344,7 +344,7 @@
BLI_strncpy(str, file, FILE_MAXDIR+FILE_MAXFILE);
if (relpath) /* can be NULL (bg mode) */
- BLI_convertstringcode(str, relpath);
+ BLI_path_abs(str, relpath);
BLI_split_dirfile(str, NULL, sfile);
fp= fopen(str, "r");
Modified: trunk/blender/source/blender/blenkernel/intern/writeavi.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/writeavi.c 2010-03-09 16:57:24 UTC (rev 27366)
+++ trunk/blender/source/blender/blenkernel/intern/writeavi.c 2010-03-09 17:36:23 UTC (rev 27367)
@@ -124,12 +124,12 @@
if (string==NULL) return;
strcpy(string, rd->pic);
- BLI_convertstringcode(string, G.sce);
+ BLI_path_abs(string, G.sce);
BLI_make_existing_file(string);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list