[Bf-blender-cvs] [b3b362a] asset-experiments: Reshufle a bit icon/preview size defines.

Bastien Montagne noreply at git.blender.org
Tue Dec 16 18:05:17 CET 2014


Commit: b3b362a2125f2b021ab5d53c773d1831c091f609
Author: Bastien Montagne
Date:   Tue Dec 16 11:12:14 2014 +0100
Branches: asset-experiments
https://developer.blender.org/rBb3b362a2125f2b021ab5d53c773d1831c091f609

Reshufle a bit icon/preview size defines.

We now have a _RENDER_ variant of those, used when creating the previews,
so that we create 32x32 icons needed for those special screens...

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

M	source/blender/editors/include/UI_interface_icons.h
M	source/blender/editors/interface/interface_icons.c
M	source/blender/editors/space_file/space_file.c
M	source/blender/imbuf/intern/thumbs.c

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

diff --git a/source/blender/editors/include/UI_interface_icons.h b/source/blender/editors/include/UI_interface_icons.h
index 41567d1..3938fa7 100644
--- a/source/blender/editors/include/UI_interface_icons.h
+++ b/source/blender/editors/include/UI_interface_icons.h
@@ -56,6 +56,9 @@ typedef struct IconFile {
 
 #define PREVIEW_DEFAULT_HEIGHT 128
 
+#define ICON_RENDER_DEFAULT_HEIGHT 32
+#define PREVIEW_RENDER_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 16f0dbf..addeeb5 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -904,8 +904,8 @@ void UI_icons_init(int first_dyn_id)
 static int preview_render_size(enum eIconSizes size)
 {
 	switch (size) {
-		case ICON_SIZE_ICON:    return ICON_DEFAULT_HEIGHT;
-		case ICON_SIZE_PREVIEW: return PREVIEW_DEFAULT_HEIGHT;
+		case ICON_SIZE_ICON:    return ICON_RENDER_DEFAULT_HEIGHT;
+		case ICON_SIZE_PREVIEW: return PREVIEW_RENDER_DEFAULT_HEIGHT;
 	}
 	return 0;
 }
diff --git a/source/blender/editors/space_file/space_file.c b/source/blender/editors/space_file/space_file.c
index a7ba441..9e6155a 100644
--- a/source/blender/editors/space_file/space_file.c
+++ b/source/blender/editors/space_file/space_file.c
@@ -193,8 +193,6 @@ static void file_refresh(const bContext *C, ScrArea *UNUSED(sa))
 	SpaceFile *sfile = CTX_wm_space_file(C);
 	FileSelectParams *params = ED_fileselect_get_params(sfile);
 
-	//~ printf("%s : %s\n", __func__, params->filter_search);
-
 	if (!sfile->folders_prev)
 		sfile->folders_prev = folderlist_new();
 	if (!sfile->files) {
diff --git a/source/blender/imbuf/intern/thumbs.c b/source/blender/imbuf/intern/thumbs.c
index 04273cd..35afceb 100644
--- a/source/blender/imbuf/intern/thumbs.c
+++ b/source/blender/imbuf/intern/thumbs.c
@@ -297,10 +297,10 @@ ImBuf *IMB_thumb_create(const char *path, ThumbSize size, ThumbSource source, Im
 
 	switch (size) {
 		case THB_NORMAL:
-			tsize = PREVIEW_DEFAULT_HEIGHT;
+			tsize = PREVIEW_RENDER_DEFAULT_HEIGHT;
 			break;
 		case THB_LARGE:
-			tsize = PREVIEW_DEFAULT_HEIGHT * 2;
+			tsize = PREVIEW_RENDER_DEFAULT_HEIGHT * 2;
 			break;
 		case THB_FAIL:
 			tsize = 1;




More information about the Bf-blender-cvs mailing list