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

== bugfix ==

Browse Source 
[#10312] Append Link (image browser) bug if combined with Open window
The only place where the special handling in newspace is relevenant is when
opening it with the windowtype_pupmenu. All other overlaying windows( render in image space, scriptspace)
should leave imagebrowser/filebrowser space alone.
This commit is contained in:
Andrea Weikert
2008-05-06 19:29:37 +00:00
parent c0d981f6db
commit 917865b504
6 changed files with 50 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,6 +34,7 @@ struct ScrArea;
struct ID;
void free_imasel(struct SpaceImaSel *simasel);
void reset_imaselspace(struct ScrArea *sa);
void clever_numbuts_imasel(void);

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

@@ -54,6 +54,7 @@ void activate_databrowse(struct ID *id, int idcode, int fromcode, int retval, sh
void activate_databrowse_args(struct ID *id, int idcode, int fromcode, short *menup, void (*func)(char *, void *, void *), void *arg1, void *arg2);
void filesel_prevspace(void);
void reset_filespace(struct ScrArea *sa);
void free_filesel_spec(char *dir);
void winqreadfilespace(struct ScrArea *sa, void *spacedata, struct BWinEvent *evt);
void main_to_filelist(struct SpaceFile *sfile);

21
source/blender/src/filesel.c
View File

@@ -1299,6 +1299,27 @@ void activate_databrowse_args(struct ID *id, int idcode, int fromcode, short *me
sfile->ipotype= fromcode;
}
/* resets a previous file space type */
/* is used when opening a filebrowser directly from windowtype_pupmenu,
since in that case we don't want any load/save/append/link action
*/
void reset_filespace(ScrArea *sa)
{
if (sa->spacetype == SPACE_FILE) {
SpaceFile *sfile= sa->spacedata.first;
if(sfile->type==FILE_MAIN) {
freefilelist(sfile);
} else {
sfile->type= FILE_UNIX;
}
sfile->returnfunc= NULL;
sfile->title[0]= 0;
if(sfile->filelist) test_flags_file(sfile);
}
}
void filesel_prevspace()
{
SpaceFile *sfile= curarea->spacedata.first;

2
source/blender/src/headerbuttons.c
View File

@@ -1434,6 +1434,8 @@ void do_global_buttons(unsigned short event)
break;
case B_NEWSPACE:
newspace(curarea, curarea->butspacetype);
reset_filespace(curarea);
reset_imaselspace(curarea);
break;
case B_LOADTEMP: /* is button from space.c */
BIF_read_autosavefile();

23
source/blender/src/imasel.c
View File

@@ -80,3 +80,26 @@ void free_imasel(SpaceImaSel *simasel)
}
}
/* resets a previous imagebrowser space type */
/* is used when opening an imagebrowser directly from windowtype_pupmenu,
since in that case we don't want any load/save/append/link action
*/
void reset_imaselspace(ScrArea *sa)
{
if(sa->spacetype==SPACE_IMASEL) {
SpaceImaSel *simasel= sa->spacedata.first;
if(simasel->type==FILE_MAIN) {
if (simasel->files) {
BIF_filelist_free(simasel->files);
BIF_filelist_settype(simasel->files, FILE_MAIN);
}
} else {
if (simasel->files) {
simasel->type= FILE_UNIX;
BIF_filelist_settype(simasel->files, simasel->type);
}
}
simasel->returnfunc= NULL;
simasel->title[0]= 0;
}
}

35
source/blender/src/space.c
View File

@@ -5611,6 +5611,7 @@ static void init_imaselspace(ScrArea *sa)
simasel->files = BIF_filelist_new();
}
/* ******************** SPACE: OOPS ********************** */
extern void drawoopsspace(ScrArea *sa, void *spacedata);
@@ -6155,39 +6156,7 @@ void newspace(ScrArea *sa, int type)
}
}
/* exception: filespace */
if(sa->spacetype==SPACE_FILE) {
SpaceFile *sfile= sa->spacedata.first;
if(sfile->type==FILE_MAIN) {
freefilelist(sfile);
} else {
sfile->type= FILE_UNIX;
}
sfile->returnfunc= NULL;
sfile->title[0]= 0;
if(sfile->filelist) test_flags_file(sfile);
}
/* exception: imasel space */
else if(sa->spacetype==SPACE_IMASEL) {
SpaceImaSel *simasel= sa->spacedata.first;
if(simasel->type==FILE_MAIN) {
if (simasel->files) {
BIF_filelist_free(simasel->files);
BIF_filelist_settype(simasel->files, FILE_MAIN);
}
} else {
if (simasel->files) {
simasel->type= FILE_UNIX;
BIF_filelist_settype(simasel->files, simasel->type);
}
}
simasel->returnfunc= NULL;
simasel->title[0]= 0;
}
else if(sa->spacetype==SPACE_OOPS) {
if(sa->spacetype==SPACE_OOPS) {
SpaceOops *so= sa->spacedata.first;
if(xtra && so->type!=SO_OUTLINER) {
so->type= SO_OUTLINER;