Revision: 35476
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35476
Author: jesterking
Date: 2011-03-11 22:06:18 +0000 (Fri, 11 Mar 2011)
Log Message:
-----------
Some explicit casts to silence warnings (unsafe to mix int and bool in
comparisons).
Modified Paths:
--------------
trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
Modified: trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp 2011-03-11
21:37:17 UTC (rev 35475)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp 2011-03-11
22:06:18 UTC (rev 35476)
@@ -470,37 +470,37 @@
switch(key) {
case GHOST_kKeyLeftShift:
{
- changed =
(modifiers.get(GHOST_kModifierKeyLeftShift) != *keyDown);
+ changed =
(modifiers.get(GHOST_kModifierKeyLeftShift) != (bool)*keyDown);
modifier =
GHOST_kModifierKeyLeftShift;
}
break;
case GHOST_kKeyRightShift:
{
- changed =
(modifiers.get(GHOST_kModifierKeyRightShift) != *keyDown);
+ changed =
(modifiers.get(GHOST_kModifierKeyRightShift) != (bool)*keyDown);
modifier =
GHOST_kModifierKeyRightShift;
}
break;
case GHOST_kKeyLeftControl:
{
- changed =
(modifiers.get(GHOST_kModifierKeyLeftControl) != *keyDown);
+ changed =
(modifiers.get(GHOST_kModifierKeyLeftControl) != (bool)*keyDown);
modifier =
GHOST_kModifierKeyLeftControl;
}
break;
case GHOST_kKeyRightControl:
{
- changed =
(modifiers.get(GHOST_kModifierKeyRightControl) != *keyDown);
+ changed =
(modifiers.get(GHOST_kModifierKeyRightControl) != (bool)*keyDown);
modifier =
GHOST_kModifierKeyRightControl;
}
break;
case GHOST_kKeyLeftAlt:
{
- changed =
(modifiers.get(GHOST_kModifierKeyLeftAlt) != *keyDown);
+ changed =
(modifiers.get(GHOST_kModifierKeyLeftAlt) != (bool)*keyDown);
modifier =
GHOST_kModifierKeyLeftAlt;
}
break;
case GHOST_kKeyRightAlt:
{
- changed =
(modifiers.get(GHOST_kModifierKeyRightAlt) != *keyDown);
+ changed =
(modifiers.get(GHOST_kModifierKeyRightAlt) != (bool)*keyDown);
modifier =
GHOST_kModifierKeyRightAlt;
}
break;
@@ -509,7 +509,7 @@
if(changed)
{
- modifiers.set(modifier, *keyDown);
+ modifiers.set(modifier, (bool)*keyDown);
system->storeModifierKeys(modifiers);
}
else
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
