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

== imagebrowser ==

Browse Source 
* bugfix: calling imagebrowser with relative path results in non-existing dir
* cleanup: removed unneeded BIF_filelist_appenddir function
* added check for valid relative base when activating imagebrowser (like in filebrowser)
This commit is contained in:
Andrea Weikert
2007-11-10 09:11:42 +00:00
parent 234bb41906
commit f9e35056af
3 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/include/BIF_filelist.h
View File

@@ -52,7 +52,6 @@ void BIF_filelist_sort(struct FileList* filelist, short sort);
int BIF_filelist_numfiles(struct FileList* filelist); int BIF_filelist_numfiles(struct FileList* filelist);
const char * BIF_filelist_dir(struct FileList* filelist); const char * BIF_filelist_dir(struct FileList* filelist);
void BIF_filelist_setdir(struct FileList* filelist, const char *dir); void BIF_filelist_setdir(struct FileList* filelist, const char *dir);
void BIF_filelist_appenddir(struct FileList* filelist, const char *relname);
struct direntry * BIF_filelist_file(struct FileList* filelist, int index); struct direntry * BIF_filelist_file(struct FileList* filelist, int index);
void BIF_filelist_hidedot(struct FileList* filelist, short hide); void BIF_filelist_hidedot(struct FileList* filelist, short hide);
void BIF_filelist_setfilter(struct FileList* filelist, unsigned int filter); void BIF_filelist_setfilter(struct FileList* filelist, unsigned int filter);

46
source/blender/src/editimasel.c
View File

@@ -127,6 +127,25 @@ static int fnmatch(const char *pattern, const char *string, int flags)
#include <fnmatch.h> #include <fnmatch.h>
#endif #endif
static void imasel_split_file(SpaceImaSel *simasel, char *s1)
{
char string[FILE_MAX], dir[FILE_MAX], file[FILE_MAX];
BLI_strncpy(string, s1, sizeof(string));
BLI_split_dirfile(string, dir, file);
if(simasel->files) {
BIF_filelist_free(simasel->files);
}
BLI_strncpy(simasel->file, file, sizeof(simasel->file));
BLI_strncpy(simasel->dir, dir, sizeof(simasel->dir));
BIF_filelist_setdir(simasel->files, dir);
BLI_make_file_string(G.sce, simasel->dir, dir, "");
}
/**************** IMAGESELECT ******************************/ /**************** IMAGESELECT ******************************/
/* the complete call; pulldown menu, and three callback types */ /* the complete call; pulldown menu, and three callback types */
@@ -174,8 +193,10 @@ static void activate_imageselect_(int type, char *title, char *file, short *menu
simasel->files = BIF_filelist_new(); simasel->files = BIF_filelist_new();
} }
if(BLI_convertstringcode(name, G.sce, G.scene->r.cfra)) simasel->flag |= FILE_STRINGCODE; if(G.relbase_valid && BLI_convertstringcode(name, G.sce, G.scene->r.cfra))
else simasel->flag &= ~FILE_STRINGCODE; simasel->flag |= FILE_STRINGCODE;
else
simasel->flag &= ~FILE_STRINGCODE;
if (U.uiflag & USER_HIDE_DOT) if (U.uiflag & USER_HIDE_DOT)
simasel->flag |= FILE_HIDE_DOT; simasel->flag |= FILE_HIDE_DOT;
@@ -200,28 +221,23 @@ static void activate_imageselect_(int type, char *title, char *file, short *menu
} }
} }
else if(type==FILE_LOADLIB) { else if(type==FILE_LOADLIB) {
BLI_strncpy(simasel->dir, name, sizeof(simasel->dir));
BIF_filelist_setdir(simasel->files, simasel->dir);
if( BIF_filelist_islibrary(simasel->files, temp, group) ) { if( BIF_filelist_islibrary(simasel->files, temp, group) ) {
/* force a reload of the library-filelist */ /* force a reload of the library-filelist */
BIF_filelist_free(simasel->files); BIF_filelist_free(simasel->files);
BIF_filelist_freelib(simasel->files); BIF_filelist_freelib(simasel->files);
BLI_strncpy(simasel->dir, name, sizeof(simasel->dir));
BIF_filelist_setdir(simasel->files, simasel->dir); BIF_filelist_setdir(simasel->files, simasel->dir);
BIF_filelist_settype(simasel->files, type); BIF_filelist_settype(simasel->files, type);
} }
else { else {
BLI_split_dirfile(file, temp, name); imasel_split_file(simasel, name);
BLI_strncpy(simasel->dir, temp, sizeof(simasel->dir));
BIF_filelist_setdir(simasel->files, simasel->dir);
BIF_filelist_free(simasel->files);
BIF_filelist_freelib(simasel->files); BIF_filelist_freelib(simasel->files);
BIF_filelist_settype(simasel->files, type); BIF_filelist_settype(simasel->files, type);
} }
} }
else { /* FILE_BLENDER */ else { /* FILE_BLENDER */
BLI_split_dirfile(file, temp, name); imasel_split_file(simasel, name);
BIF_filelist_free(simasel->files);
BIF_filelist_setdir(simasel->files, temp);
BIF_filelist_settype(simasel->files, type); BIF_filelist_settype(simasel->files, type);
BLI_cleanup_dir(G.sce, simasel->dir); BLI_cleanup_dir(G.sce, simasel->dir);
@@ -922,18 +938,16 @@ void winqreadimaselspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
file = BIF_filelist_file(simasel->files, simasel->active_file); file = BIF_filelist_file(simasel->files, simasel->active_file);
if(file && S_ISDIR(file->type)) { if(file && S_ISDIR(file->type)) {
strcat(simasel->dir, file->relname);
BIF_filelist_appenddir(simasel->files, file->relname);
BLI_strncpy(simasel->dir, BIF_filelist_dir(simasel->files), FILE_MAXDIR);
strcat(simasel->dir,"/"); strcat(simasel->dir,"/");
simasel->file[0] = '\0'; simasel->file[0] = '\0';
BLI_cleanup_dir(G.sce, simasel->dir); BLI_cleanup_dir(G.sce, simasel->dir);
BIF_filelist_setdir(simasel->files, simasel->dir);
BIF_filelist_free(simasel->files); BIF_filelist_free(simasel->files);
simasel->active_file = -1; simasel->active_file = -1;
simasel->scrollpos = 0; simasel->scrollpos = 0;
do_draw = 1; do_draw = 1;
do_headdraw = 1; do_headdraw = 1;
} }
else if (file) else if (file)
{ {

6
source/blender/src/filelist.c
View File

@@ -441,12 +441,6 @@ void BIF_filelist_setdir(struct FileList* filelist, const char *dir)
BLI_strncpy(filelist->dir, dir, FILE_MAXDIR); BLI_strncpy(filelist->dir, dir, FILE_MAXDIR);
} }
void BIF_filelist_appenddir(struct FileList* filelist, const char *relname)
{
strcat(filelist->dir, relname);
BLI_cleanup_dir(G.sce, filelist->dir);
}
void BIF_filelist_imgsize(struct FileList* filelist, short w, short h) void BIF_filelist_imgsize(struct FileList* filelist, short w, short h)
{ {
filelist->prv_w = w; filelist->prv_w = w;