Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Wiggin <ender79bl@gmail.com>2011-09-25 16:33:51 +0400
committerAndrew Wiggin <ender79bl@gmail.com>2011-09-25 16:33:51 +0400
commit7c46f1c4b77873c27485bc278e04195611237602 (patch)
treed1b92fda781d736bc8f3ebb0902876651bac6ff0 /source/blender/editors/include/UI_interface_icons.h
parent274b9c8fb88ff6499ac3b13a081c1e60965e459e (diff)
Fix some MSVC 2010 warnings (including one apparent bug in intern/elbeem/intern/solver_relax.h)
Diffstat (limited to 'source/blender/editors/include/UI_interface_icons.h')
-rw-r--r--source/blender/editors/include/UI_interface_icons.h4
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