diff options
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 6 | ||||
-rw-r--r-- | source/blender/src/header_filesel.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index ee2c39d2d5a..97e7828a91c 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -5282,10 +5282,10 @@ static void append_named_part(FileData *fd, Main *mainvar, Scene *scene, char *n base->object= ob; ob->id.us++; - if(!(flag & FILE_AUTOSELECT)) { /* inverse logic here, because we want it to be the default action */ + if(flag & FILE_AUTOSELECT) { base->flag |= SELECT; base->object->flag = base->flag; - G.scene->basact = base; + /* do NOT make base active here! screws up GUI stuff, if you want it do it on src/ level */ } } afbreek= 1; @@ -5388,7 +5388,7 @@ void BLO_library_append(SpaceFile *sfile, char *dir, int idcode) } /* now we have or selected, or an indicated file */ - if(!(sfile->flag & FILE_AUTOSELECT)) scene_deselect_all(G.scene); + if(sfile->flag & FILE_AUTOSELECT) scene_deselect_all(G.scene); mainlist.first= mainlist.last= G.main; G.main->next= NULL; diff --git a/source/blender/src/header_filesel.c b/source/blender/src/header_filesel.c index 663c0c9bbb0..42f3b931ecf 100644 --- a/source/blender/src/header_filesel.c +++ b/source/blender/src/header_filesel.c @@ -149,11 +149,11 @@ void file_buttons(void) uiDefButS(block, TOG|BIT|2, B_REDR, "Link", xco+=100,0,100,YIC, &sfile->flag, 0, 0, 0, 0, "Creates a link to selected data from current project"); uiBlockEndAlign(block); uiBlockBeginAlign(block); - uiDefButS(block, TOGN|BIT|4, B_REDR, "Autosel", xco+=125,0,65,YIC, &sfile->flag, 0, 0, 0, 0, "Autoselect imported objects"); + uiDefButS(block, TOG|BIT|4, B_REDR, "Autosel", xco+=125,0,65,YIC, &sfile->flag, 0, 0, 0, 0, "Autoselect imported objects"); uiDefButS(block, TOG|BIT|5, B_REDR, "Active Layer", xco+=65,0,80,YIC, &sfile->flag, 0, 0, 0, 0, "Append object(s) in active layer"); uiDefButS(block, TOG|BIT|6, B_REDR, "At Cursor", xco+=80,0,65,YIC, &sfile->flag, 0, 0, 0, 0, "Append object(s) at cursor, use centroid if more than one object is selected"); uiBlockEndAlign(block); - } else { + } else if(sfile->type==FILE_BLENDER) { uiDefButI(block, TOGN|BIT|10, B_REDR, "Load UI", xco+=XIC,0,80,YIC, &G.fileflags, 0, 0, 0, 0, "Load the UI setup as well as the scene data"); xco+=100; } |