[Bf-blender-cvs] [46cf8ba] asset-engine: Cleanup.

[Bastien Montagne]

Commit: 46cf8ba2692660efd8662a927313fcc283a3c3a3
Author: Bastien Montagne
Date:   Tue Jun 14 16:36:15 2016 +0200
Branches: asset-engine
https://developer.blender.org/rB46cf8ba2692660efd8662a927313fcc283a3c3a3

Cleanup.

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

M	source/blender/windowmanager/intern/wm_files_link.c

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

diff --git a/source/blender/windowmanager/intern/wm_files_link.c b/source/blender/windowmanager/intern/wm_files_link.c
index 8d2d1f7..5b88f59 100644
--- a/source/blender/windowmanager/intern/wm_files_link.c
+++ b/source/blender/windowmanager/intern/wm_files_link.c
@@ -78,6 +78,7 @@
 #include "IMB_colormanagement.h"
 
 #include "ED_screen.h"
+#include "ED_fileselect.h"
 
 #include "GPU_material.h"
 
@@ -221,6 +222,25 @@ static WMLinkAppendDataItem *wm_link_append_data_item_add(
 	return item;
 }
 
+static int path_to_idcode(const char *path)
+{
+	const int filetype = ED_path_extension_type(path);
+	switch (filetype) {
+		case FILE_TYPE_IMAGE:
+		case FILE_TYPE_MOVIE:
+			return ID_IM;
+		case FILE_TYPE_FTFONT:
+			return ID_VF;
+		case FILE_TYPE_SOUND:
+			return ID_SO;
+		case FILE_TYPE_PYSCRIPT:
+		case FILE_TYPE_TEXT:
+			return ID_TXT;
+		default:
+			return 0;
+	}
+}
+
 static void wm_link_virtual_lib(WMLinkAppendData *lapp_data, Main *bmain, AssetEngineType *aet, const int lib_idx)
 {
 	LinkNode *itemlink;
@@ -344,76 +364,6 @@ static void wm_link_do(
 	}
 }
 
-
-/* XXXXXX Copied from editors' filelist.c, needs to be moved to BLI probably? */
-#include "IMB_imbuf.h"
-#include "IMB_imbuf_types.h"
-static int path_extension_type(const char *path)
-{
-	if (BLO_has_bfile_extension(path)) {
-		return FILE_TYPE_BLENDER;
-	}
-//	else if (file_is_blend_backup(path)) {
-//		return FILE_TYPE_BLENDER_BACKUP;
-//	}
-	else if (BLI_testextensie(path, ".app")) {
-		return FILE_TYPE_APPLICATIONBUNDLE;
-	}
-	else if (BLI_testextensie(path, ".py")) {
-		return FILE_TYPE_PYSCRIPT;
-	}
-	else if (BLI_testextensie_n(path, ".txt", ".glsl", ".osl", ".data", NULL)) {
-		return FILE_TYPE_TEXT;
-	}
-	else if (BLI_testextensie_n(path, ".ttf", ".ttc", ".pfb", ".otf", ".otc", NULL)) {
-		return FILE_TYPE_FTFONT;
-	}
-	else if (BLI_testextensie(path, ".btx")) {
-		return FILE_TYPE_BTX;
-	}
-	else if (BLI_testextensie(path, ".dae")) {
-		return FILE_TYPE_COLLADA;
-	}
-	else if (BLI_testextensie_array(path, imb_ext_image) ||
-	         (G.have_quicktime && BLI_testextensie_array(path, imb_ext_image_qt)))
-	{
-		return FILE_TYPE_IMAGE;
-	}
-	else if (BLI_testextensie(path, ".ogg")) {
-		if (IMB_isanim(path)) {
-			return FILE_TYPE_MOVIE;
-		}
-		else {
-			return FILE_TYPE_SOUND;
-		}
-	}
-	else if (BLI_testextensie_array(path, imb_ext_movie)) {
-		return FILE_TYPE_MOVIE;
-	}
-	else if (BLI_testextensie_array(path, imb_ext_audio)) {
-		return FILE_TYPE_SOUND;
-	}
-	return 0;
-}
-static int path_to_idcode(const char *path)
-{
-	const int filetype = path_extension_type(path);
-	switch (filetype) {
-		case FILE_TYPE_IMAGE:
-		case FILE_TYPE_MOVIE:
-			return ID_IM;
-		case FILE_TYPE_FTFONT:
-			return ID_VF;
-		case FILE_TYPE_SOUND:
-			return ID_SO;
-		case FILE_TYPE_PYSCRIPT:
-		case FILE_TYPE_TEXT:
-			return ID_TXT;
-		default:
-			return 0;
-	}
-}
-
 static int wm_link_append_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);