kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Some explicit casts to silence warnings (unsafe to mix int and bool in comparisons).

Browse Source
This commit is contained in:
Nathan Letwory 2011-03-11 22:06:18 +00:00
parent 977fdc5a56
commit 60a4c9d09e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
intern/ghost/intern/GHOST_SystemWin32.cpp
View File

@ -470,37 +470,37 @@ GHOST_TKey GHOST_SystemWin32::hardKey(GHOST_IWindow *window, WPARAM wParam, LPAR
switch(key) { switch(key) {
case GHOST_kKeyLeftShift: case GHOST_kKeyLeftShift:
{ {
changed = (modifiers.get(GHOST_kModifierKeyLeftShift) != *keyDown); changed = (modifiers.get(GHOST_kModifierKeyLeftShift) != (bool)*keyDown);
modifier = GHOST_kModifierKeyLeftShift; modifier = GHOST_kModifierKeyLeftShift;
} }
break; break;
case GHOST_kKeyRightShift: case GHOST_kKeyRightShift:
{ {
changed = (modifiers.get(GHOST_kModifierKeyRightShift) != *keyDown); changed = (modifiers.get(GHOST_kModifierKeyRightShift) != (bool)*keyDown);
modifier = GHOST_kModifierKeyRightShift; modifier = GHOST_kModifierKeyRightShift;
} }
break; break;
case GHOST_kKeyLeftControl: case GHOST_kKeyLeftControl:
{ {
changed = (modifiers.get(GHOST_kModifierKeyLeftControl) != *keyDown); changed = (modifiers.get(GHOST_kModifierKeyLeftControl) != (bool)*keyDown);
modifier = GHOST_kModifierKeyLeftControl; modifier = GHOST_kModifierKeyLeftControl;
} }
break; break;
case GHOST_kKeyRightControl: case GHOST_kKeyRightControl:
{ {
changed = (modifiers.get(GHOST_kModifierKeyRightControl) != *keyDown); changed = (modifiers.get(GHOST_kModifierKeyRightControl) != (bool)*keyDown);
modifier = GHOST_kModifierKeyRightControl; modifier = GHOST_kModifierKeyRightControl;
} }
break; break;
case GHOST_kKeyLeftAlt: case GHOST_kKeyLeftAlt:
{ {
changed = (modifiers.get(GHOST_kModifierKeyLeftAlt) != *keyDown); changed = (modifiers.get(GHOST_kModifierKeyLeftAlt) != (bool)*keyDown);
modifier = GHOST_kModifierKeyLeftAlt; modifier = GHOST_kModifierKeyLeftAlt;
} }
break; break;
case GHOST_kKeyRightAlt: case GHOST_kKeyRightAlt:
{ {
changed = (modifiers.get(GHOST_kModifierKeyRightAlt) != *keyDown); changed = (modifiers.get(GHOST_kModifierKeyRightAlt) != (bool)*keyDown);
modifier = GHOST_kModifierKeyRightAlt; modifier = GHOST_kModifierKeyRightAlt;
} }
break; break;
@ -509,7 +509,7 @@ GHOST_TKey GHOST_SystemWin32::hardKey(GHOST_IWindow *window, WPARAM wParam, LPAR
if(changed) if(changed)
{ {
modifiers.set(modifier, *keyDown); modifiers.set(modifier, (bool)*keyDown);
system->storeModifierKeys(modifiers); system->storeModifierKeys(modifiers);
} }
else else