[Bf-blender-cvs] [35f985fcd5b] filebrowser_redesign: Icons: Add support for 3d model file types

[William Reynish]

Commit: 35f985fcd5bc30806a376ed5145b01c7b1010978
Author: William Reynish
Date:   Mon Aug 12 00:29:30 2019 +0200
Branches: filebrowser_redesign
https://developer.blender.org/rB35f985fcd5bc30806a376ed5145b01c7b1010978

Icons: Add support for 3d model file types

OBJ, 3DS, GLTF, FBX, Collada

===================================================================

M	source/blender/editors/space_file/filelist.c
M	source/blender/makesdna/DNA_space_types.h

===================================================================

diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c
index 6570371f3ec..6cd481343eb 100644
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@ -983,10 +983,22 @@ static int filelist_geticon_ex(const int typeflag,
     return ICON_FILE_BLANK;
   }
   else if (typeflag & FILE_TYPE_COLLADA) {
-    return ICON_FILE_BLANK;
+    return ICON_FILE_3D;
+  }
+  else if (typeflag & FILE_TYPE_OBJ) {
+    return ICON_FILE_3D;
+  }
+  else if (typeflag & FILE_TYPE_FBX) {
+    return ICON_FILE_3D;
+  }
+  else if (typeflag & FILE_TYPE_3DS) {
+    return ICON_FILE_3D;
+  }
+  else if (typeflag & FILE_TYPE_GLTF) {
+    return ICON_FILE_3D;
   }
   else if (typeflag & FILE_TYPE_ALEMBIC) {
-    return ICON_FILE_BLANK;
+    return ICON_FILE_3D;
   }
   else if (typeflag & FILE_TYPE_TEXT) {
     return ICON_FILE_TEXT;
@@ -2110,6 +2122,21 @@ int ED_path_extension_type(const char *path)
   else if (BLI_path_extension_check(path, ".abc")) {
     return FILE_TYPE_ALEMBIC;
   }
+  else if (BLI_path_extension_check(path, ".obj")) {
+    return FILE_TYPE_OBJ;
+  }
+  else if (BLI_path_extension_check(path, ".3ds")) {
+    return FILE_TYPE_3DS;
+  }
+  else if (BLI_path_extension_check(path, ".fbx")) {
+    return FILE_TYPE_FBX;
+  }
+  else if (BLI_path_extension_check(path, ".glb")) {
+    return FILE_TYPE_GLTF;
+  }
+  else if (BLI_path_extension_check(path, ".gltf")) {
+    return FILE_TYPE_GLTF;
+  }
   else if (BLI_path_extension_check_array(path, imb_ext_image)) {
     return FILE_TYPE_IMAGE;
   }
@@ -2159,9 +2186,17 @@ int ED_file_extension_icon(const char *path)
     case FILE_TYPE_BTX:
       return ICON_FILE_BLANK;
     case FILE_TYPE_COLLADA:
-      return ICON_FILE_BLANK;
+      return ICON_FILE_3D;
     case FILE_TYPE_ALEMBIC:
-      return ICON_FILE_BLANK;
+      return ICON_FILE_3D;
+    case FILE_TYPE_3DS:
+      return ICON_FILE_3D;
+    case FILE_TYPE_OBJ:
+      return ICON_FILE_3D;
+    case FILE_TYPE_GLTF:
+      return ICON_FILE_3D;
+    case FILE_TYPE_FBX:
+      return ICON_FILE_3D;
     case FILE_TYPE_TEXT:
       return ICON_FILE_TEXT;
     default:
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index 1b1b8fe2cce..3e02a8a647d 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -826,6 +826,10 @@ typedef enum eFileSel_File_Types {
   FILE_TYPE_OPERATOR = (1 << 14),
   FILE_TYPE_APPLICATIONBUNDLE = (1 << 15),
   FILE_TYPE_ALEMBIC = (1 << 16),
+  FILE_TYPE_OBJ = (1 << 17),
+  FILE_TYPE_3DS = (1 << 18),
+  FILE_TYPE_FBX = (1 << 19),
+  FILE_TYPE_GLTF = (1 << 20),
 
   /** An FS directory (i.e. S_ISDIR on its path is true). */
   FILE_TYPE_DIR = (1 << 30),