[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35733] trunk/blender/source/blender/ editors/space_file/filelist.c: fix [#26591] File browser: select multiple files for Library append/link broken

[Andrea Weikert]

Revision: 35733
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35733
Author:   elubie
Date:     2011-03-23 18:51:31 +0000 (Wed, 23 Mar 2011)
Log Message:
-----------
fix [#26591] File browser: select multiple files for Library append/link broken
* added check for valid files a bit too eagerly in Rev.35654. Solved now by
  setting correct type for .blend file contents. Objects are now tagged as
  regular files, while the list (Mesh, Material, ...) (no idcode given) is
  tagged as directory.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_file/filelist.c

Modified: trunk/blender/source/blender/editors/space_file/filelist.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/filelist.c	2011-03-23 16:36:41 UTC (rev 35732)
+++ trunk/blender/source/blender/editors/space_file/filelist.c	2011-03-23 18:51:31 UTC (rev 35733)
@@ -1057,8 +1057,11 @@
 		char *blockname= l->link;
 
 		filelist->filelist[i + 1].relname= BLI_strdup(blockname);
-		if (!idcode)
+		if (idcode) {
+			filelist->filelist[i + 1].type |= S_IFREG;
+		} else {
 			filelist->filelist[i + 1].type |= S_IFDIR;
+		}
 	}
 	
 	if(previews) {
@@ -1194,7 +1197,7 @@
 						files->relname= MEM_mallocN(FILE_MAXDIR+FILE_MAXFILE+32, "filename for lib");
 						sprintf(files->relname, "%s | %s", id->lib->name, id->name+2);
 					}
-					/* files->type |= S_IFDIR; */
+					files->type |= S_IFREG;
 #if 0				// XXXXX TODO show the selection status of the objects
 					if(!filelist->has_func) { /* F4 DATA BROWSE */
 						if(idcode==ID_OB) {