diff options
author | Andrea Weikert <elubie@gmx.net> | 2008-05-06 23:29:37 +0400 |
---|---|---|
committer | Andrea Weikert <elubie@gmx.net> | 2008-05-06 23:29:37 +0400 |
commit | 917865b5049acaa2e13b7d40ebf879121c7e2148 (patch) | |
tree | 0c1118f66812ffba077317c6d4f34463b1fceaf2 /source/blender/src/filesel.c | |
parent | c0d981f6db057fbe8c5a9483382bab1e20572e38 (diff) |
== bugfix ==
[#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.
Diffstat (limited to 'source/blender/src/filesel.c')
-rw-r--r-- | source/blender/src/filesel.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/source/blender/src/filesel.c b/source/blender/src/filesel.c index 19372dcbee6..bfff2f10ab6 100644 --- a/source/blender/src/filesel.c +++ b/source/blender/src/filesel.c @@ -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; |