[Bf-blender-cvs] [89db98c] asset-experiments: Address new review points.

[Bastien Montagne]

Commit: 89db98c0becf1cc608825c161602fd5ec17dd201
Author: Bastien Montagne
Date:   Wed Jun 3 15:47:43 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rB89db98c0becf1cc608825c161602fd5ec17dd201

Address new review points.

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

M	source/blender/editors/include/UI_interface.h
M	source/blender/editors/interface/interface.c
M	source/blender/editors/space_file/file_draw.c
M	source/blender/editors/space_file/filelist.c

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

diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index bea6a64..03f1c61 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -471,7 +471,7 @@ void    UI_but_drag_set_path(uiBut *but, const char *path, const bool use_free);
 void    UI_but_drag_set_name(uiBut *but, const char *name);
 void    UI_but_drag_set_value(uiBut *but);
 void    UI_but_drag_set_image(
-                uiBut *but, const char *path, const bool use_free, int icon, struct ImBuf *ima, float scale);
+                uiBut *but, const char *path, int icon, struct ImBuf *ima, float scale, const bool use_free);
 
 bool    UI_but_active_drop_name(struct bContext *C);
 bool    UI_but_active_drop_color(struct bContext *C);
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index f3935bd..d9fe0c7 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -4102,7 +4102,7 @@ void UI_but_drag_set_value(uiBut *but)
 	but->dragtype = WM_DRAG_VALUE;
 }
 
-void UI_but_drag_set_image(uiBut *but, const char *path, const bool use_free, int icon, struct ImBuf *imb, float scale)
+void UI_but_drag_set_image(uiBut *but, const char *path, int icon, struct ImBuf *imb, float scale, const bool use_free)
 {
 	but->dragtype = WM_DRAG_PATH;
 	ui_def_but_icon(but, icon, 0);  /* no flag UI_HAS_ICON, so icon doesnt draw in button */
diff --git a/source/blender/editors/space_file/file_draw.c b/source/blender/editors/space_file/file_draw.c
index 107ae7b..9f7ae93 100644
--- a/source/blender/editors/space_file/file_draw.c
+++ b/source/blender/editors/space_file/file_draw.c
@@ -386,7 +386,7 @@ static void file_draw_preview(
 	/* dragregion */
 	if (drag) {
 		/* path is no more static, cannot give it directly to but... */
-		UI_but_drag_set_image(but, BLI_strdup(path), true, icon, imb, scale);
+		UI_but_drag_set_image(but, BLI_strdup(path), icon, imb, scale, true);
 	}
 
 	glDisable(GL_BLEND);
diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c
index d5dd592..7389f66 100644
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@ -1898,28 +1898,30 @@ int ED_file_extension_icon(const char *path)
 {
 	int type = path_extension_type(path);
 	
-	if (type == FILE_TYPE_BLENDER)
-		return ICON_FILE_BLEND;
-	else if (type == FILE_TYPE_BLENDER_BACKUP)
-		return ICON_FILE_BACKUP;
-	else if (type == FILE_TYPE_IMAGE)
-		return ICON_FILE_IMAGE;
-	else if (type == FILE_TYPE_MOVIE)
-		return ICON_FILE_MOVIE;
-	else if (type == FILE_TYPE_PYSCRIPT)
-		return ICON_FILE_SCRIPT;
-	else if (type == FILE_TYPE_SOUND)
-		return ICON_FILE_SOUND;
-	else if (type == FILE_TYPE_FTFONT)
-		return ICON_FILE_FONT;
-	else if (type == FILE_TYPE_BTX)
-		return ICON_FILE_BLANK;
-	else if (type == FILE_TYPE_COLLADA)
-		return ICON_FILE_BLANK;
-	else if (type == FILE_TYPE_TEXT)
-		return ICON_FILE_TEXT;
-	
-	return ICON_FILE_BLANK;
+	switch (type) {
+		case FILE_TYPE_BLENDER:
+			return ICON_FILE_BLEND;
+		case FILE_TYPE_BLENDER_BACKUP:
+			return ICON_FILE_BACKUP;
+		case FILE_TYPE_IMAGE:
+			return ICON_FILE_IMAGE;
+		case FILE_TYPE_MOVIE:
+			return ICON_FILE_MOVIE;
+		case FILE_TYPE_PYSCRIPT:
+			return ICON_FILE_SCRIPT;
+		case FILE_TYPE_SOUND:
+			return ICON_FILE_SOUND;
+		case FILE_TYPE_FTFONT:
+			return ICON_FILE_FONT;
+		case FILE_TYPE_BTX:
+			return ICON_FILE_BLANK;
+		case FILE_TYPE_COLLADA:
+			return ICON_FILE_BLANK;
+		case FILE_TYPE_TEXT:
+			return ICON_FILE_TEXT;
+		default:
+			return ICON_FILE_BLANK;
+	}
 }
 
 int filelist_empty(struct FileList *filelist)