diff options
| author | Miika Hamalainen <blender@miikah.org> | 2011-10-04 15:42:44 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2011-10-04 15:42:44 +0400 |
| commit | e8bb972f3c04b00f6e813b61332c53213c12e8c4 (patch) | |
| tree | 5d05e7c8421c5af4e034ff3a01ebe34a2d94b9ec /source/blender/editors/include/UI_interface_icons.h | |
| parent | 9e9b26b8ba54227f79f97acc87893611d61b9831 (diff) | |
| parent | 019dca9c54289136b34c688a048ee009e2e852ee (diff) | |
Merge with trunk r40782
Diffstat (limited to 'source/blender/editors/include/UI_interface_icons.h')
| -rw-r--r-- | source/blender/editors/include/UI_interface_icons.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/include/UI_interface_icons.h b/source/blender/editors/include/UI_interface_icons.h index b6837a4b3c9..54400accbc2 100644 --- a/source/blender/editors/include/UI_interface_icons.h +++ b/source/blender/editors/include/UI_interface_icons.h @@ -50,8 +50,8 @@ typedef struct IconFile { #define ICON_DEFAULT_HEIGHT 16 #define ICON_DEFAULT_WIDTH 16 -#define ICON_DEFAULT_HEIGHT_SCALE (UI_UNIT_Y * 0.8f) -#define ICON_DEFAULT_WIDTH_SCALE (UI_UNIT_X * 0.8f) +#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 |