Objects will be autoselected on Append. There's a button to toggle this behaviour, by default it's enabled.

Feature requested by Bastian Salmela.

3 files changed, 14 insertions, 4 deletions

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 55e444bcd4f..4f10130c3b7 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -4894,7 +4894,7 @@ static void give_base_to_objects(Scene *sce, ListBase *lb)
 }
 #endif
 
-static void append_named_part(FileData *fd, Main *mainvar, Scene *scene, char *name, int idcode)
+static void append_named_part(FileData *fd, Main *mainvar, Scene *scene, char *name, int idcode, short flag)
 {
 	Object *ob;
 	Base *base;
@@ -4934,6 +4934,12 @@ static void append_named_part(FileData *fd, Main *mainvar, Scene *scene, char *n
 					base->lay= ob->lay;
 					base->object= ob;
 					ob->id.us++;
+					
+					if(!(flag & FILE_AUTOSELECT)) { /* inverse logic here, because we want it to be the default action */
+						base->flag |= SELECT;
+						base->object->flag = base->flag;
+						G.scene->basact = base;
+					}
 				}
 				afbreek= 1;
 			}
@@ -4983,7 +4989,7 @@ void BLO_script_library_append(BlendHandle *bh, char *dir, char *name, int idcod
 	/* which one do we need? */
 	mainl = blo_find_main(&mainlist, dir);
 
-	append_named_part(fd, mainl, G.scene, name, idcode);
+	append_named_part(fd, mainl, G.scene, name, idcode, 0);
 
 	/* make main consistant */
 	expand_main(fd, mainl);
@@ -5029,6 +5035,8 @@ 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);
 
 	mainlist.first= mainlist.last= G.main;
 	G.main->next= NULL;
@@ -5041,12 +5049,12 @@ void BLO_library_append(SpaceFile *sfile, char *dir, int idcode)
 	mainl->versionfile= fd->fileversion;	// needed for do_version
 	
 	if(totsel==0) {
-		append_named_part(fd, mainl, G.scene, sfile->file, idcode);
+		append_named_part(fd, mainl, G.scene, sfile->file, idcode, sfile->flag);
 	}
 	else {
 		for(a=0; a<sfile->totfile; a++) {
 			if(sfile->filelist[a].flags & ACTIVE) {
-				append_named_part(fd, mainl, G.scene, sfile->filelist[a].relname, idcode);
+				append_named_part(fd, mainl, G.scene, sfile->filelist[a].relname, idcode, sfile->flag);
 			}
 		}
 	}
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index 3f81e9a211e..ad4600c86b8 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -395,6 +395,7 @@ typedef struct SpaceImaSel {
 #define FILE_STRINGCODE		2
 #define FILE_LINK			4
 #define FILE_HIDE_DOT		8
+#define FILE_AUTOSELECT		16
 
 /* sfile->sort */
 #define FILE_SORTALPHA		0
diff --git a/source/blender/src/header_filesel.c b/source/blender/src/header_filesel.c
index f274b012726..a9abefe30e3 100644
--- a/source/blender/src/header_filesel.c
+++ b/source/blender/src/header_filesel.c
@@ -144,6 +144,7 @@ void file_buttons(void)
 	if(sfile->type==FILE_LOADLIB) {
 		uiDefButS(block, TOGN|BIT|2, B_REDR, "Append",		xco+=XIC,0,100,YIC, &sfile->flag, 0, 0, 0, 0, "Copies selected data into current project");
 		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");
+		uiDefButS(block, TOGN|BIT|4, B_REDR, "Autosel", xco+=100,0,100,YIC, &sfile->flag, 0, 0, 0, 0, "Autoselect imported objects");
 	}
 
 	if(sfile->type==FILE_UNIX) {