[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61065] trunk/blender/source/blender: OSX: as per Brechts note, do OSX app_bundle icon using BLI_testextensie

[jens verwiebe]

Revision: 61065
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=61065
Author:   jensverwiebe
Date:     2013-11-02 23:40:39 +0000 (Sat, 02 Nov 2013)
Log Message:
-----------
OSX: as per Brechts note, do OSX app_bundle icon using BLI_testextensie

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_file/file_draw.c
    trunk/blender/source/blender/editors/space_file/filelist.c
    trunk/blender/source/blender/makesdna/DNA_space_types.h

Modified: trunk/blender/source/blender/editors/space_file/file_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/file_draw.c	2013-11-02 17:58:53 UTC (rev 61064)
+++ trunk/blender/source/blender/editors/space_file/file_draw.c	2013-11-02 23:40:39 UTC (rev 61065)
@@ -251,11 +251,9 @@
 		if (strcmp(file->relname, "..") == 0) {
 			return ICON_FILE_PARENT;
 		}
-#ifdef __APPLE__
-		if (strcmp(&file->relname[strlen(file->relname) - 4], ".app") == 0) {
+		if (file->flags & APPLICATIONBUNDLE) {
 			return ICON_UGLYPACKAGE;
 		}
-#endif
 		if (file->flags & BLENDERFILE) {
 			return ICON_FILE_BLEND;
 		}

Modified: trunk/blender/source/blender/editors/space_file/filelist.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/filelist.c	2013-11-02 17:58:53 UTC (rev 61064)
+++ trunk/blender/source/blender/editors/space_file/filelist.c	2013-11-02 23:40:39 UTC (rev 61065)
@@ -772,6 +772,9 @@
 	else if (file_is_blend_backup(path)) {
 		return BLENDERFILE_BACKUP;
 	}
+	else if (BLI_testextensie(path, ".app")) {
+		return APPLICATIONBUNDLE;
+	}
 	else if (BLI_testextensie(path, ".py")) {
 		return PYSCRIPTFILE;
 	}
@@ -863,8 +866,8 @@
 	for (num = 0; num < filelist->numfiles; num++, file++) {
 		file->type = file->s.st_mode;  /* restore the mess below */
 		
-		/* Don't check extensions for directories */ 
-		if (file->type & S_IFDIR) {
+		/* Don't check extensions for directories, allow in OSX application bundles */
+		if ((file->type & S_IFDIR) && (!APPLICATIONBUNDLE)) {
 			continue;
 		}
 		file->flags = file_extension_type(filelist->dir, file->relname);

Modified: trunk/blender/source/blender/makesdna/DNA_space_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_space_types.h	2013-11-02 17:58:53 UTC (rev 61064)
+++ trunk/blender/source/blender/makesdna/DNA_space_types.h	2013-11-02 23:40:39 UTC (rev 61065)
@@ -693,6 +693,7 @@
 	BTXFILE             = (1 << 12),
 	COLLADAFILE         = (1 << 13),
 	OPERATORFILE        = (1 << 14), /* from filter_glob operator property */
+	APPLICATIONBUNDLE   = (1 << 15),
 } eFileSel_File_Types;
 
 /* Selection Flags in filesel: struct direntry, unsigned char selflag */