[Bf-blender-cvs] [d605e77] ui-preview-buttons: match master

Campbell Barton noreply at git.blender.org
Mon May 11 15:44:54 CEST 2015


Commit: d605e7785b0e658eef6bf91e9f0414a17a6a284e
Author: Campbell Barton
Date:   Mon May 11 23:43:46 2015 +1000
Branches: ui-preview-buttons
https://developer.blender.org/rBd605e7785b0e658eef6bf91e9f0414a17a6a284e

match master

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

M	source/blender/editors/include/UI_interface_icons.h

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

diff --git a/source/blender/editors/include/UI_interface_icons.h b/source/blender/editors/include/UI_interface_icons.h
index 97c1952..92f3b01 100644
--- a/source/blender/editors/include/UI_interface_icons.h
+++ b/source/blender/editors/include/UI_interface_icons.h
@@ -45,11 +45,12 @@ typedef struct IconFile {
 
 #define ICON_DEFAULT_HEIGHT 16
 #define ICON_DEFAULT_WIDTH  16
-#define PREVIEW_DEFAULT_HEIGHT 128
 
 #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 128
+
 /*
  * Resizable Icons for Blender
  */




More information about the Bf-blender-cvs mailing list