[Bf-blender-cvs] [66f3def] asset-experiments: Cleanup: use ICON_DEFAULT_HEIGHT everywhere for ICON_SIZE_ICON

[Bastien Montagne]

Commit: 66f3def3b4c1262c071c3d0b5e9ad356008426d5
Author: Bastien Montagne
Date:   Mon Dec 15 13:02:54 2014 +0100
Branches: asset-experiments
https://developer.blender.org/rB66f3def3b4c1262c071c3d0b5e9ad356008426d5

Cleanup: use ICON_DEFAULT_HEIGHT everywhere for ICON_SIZE_ICON

If we need bigger icon size for previews (like 32 instead of 16), then
it should be handled everywhere!

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

M	source/blender/editors/include/UI_interface_icons.h
M	source/blender/editors/interface/interface_icons.c

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

diff --git a/source/blender/editors/include/UI_interface_icons.h b/source/blender/editors/include/UI_interface_icons.h
index 6104505..4a896de 100644
--- a/source/blender/editors/include/UI_interface_icons.h
+++ b/source/blender/editors/include/UI_interface_icons.h
@@ -54,7 +54,7 @@ typedef struct IconFile {
 #define ICON_DEFAULT_HEIGHT_SCALE ((int)(UI_UNIT_Y * 0.8f))
 #define ICON_DEFAULT_WIDTH_SCALE  ((int)(UI_UNIT_X * 0.8f))
 
-#define PREVIEW_DEFAULT_HEIGHT 96
+#define PREVIEW_DEFAULT_HEIGHT 128
 
 /*
  * Resizable Icons for Blender
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c
index 517b8b6..56d718f 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -904,7 +904,7 @@ void UI_icons_init(int first_dyn_id)
 static int preview_render_size(enum eIconSizes size)
 {
 	switch (size) {
-		case ICON_SIZE_ICON:    return 32;
+		case ICON_SIZE_ICON:    return ICON_DEFAULT_HEIGHT;
 		case ICON_SIZE_PREVIEW: return PREVIEW_DEFAULT_HEIGHT;
 	}
 	return 0;