diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2017-10-16 12:16:13 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2017-10-16 12:22:35 +0300 |
| commit | a78b3ee53aa53020b086a6df25c0e28491223dcc (patch) | |
| tree | bd883e95580f5777f7eae7cac4e47f182ac9fc00 /source/gameengine/GamePlayer/common | |
| parent | 4842cc017c3bb7df2070c2f96605190ff88e6a2e (diff) | |
| parent | 49f4ac17bf704614de59a4db7a65c205c085d694 (diff) | |
Merge remote-tracking branch 'origin/master' into openvdbopenvdb
Diffstat (limited to 'source/gameengine/GamePlayer/common')
| -rw-r--r-- | source/gameengine/GamePlayer/common/GPC_Canvas.h | 2 | ||||
| -rw-r--r-- | source/gameengine/GamePlayer/common/GPC_MouseDevice.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/source/gameengine/GamePlayer/common/GPC_Canvas.h b/source/gameengine/GamePlayer/common/GPC_Canvas.h index 9a108203ee8..688ed8ac0f4 100644 --- a/source/gameengine/GamePlayer/common/GPC_Canvas.h +++ b/source/gameengine/GamePlayer/common/GPC_Canvas.h @@ -40,7 +40,7 @@ # include <windows.h> #endif /* WIN32 */ -#include "glew-mx.h" +#include "GPU_glew.h" #include <map> diff --git a/source/gameengine/GamePlayer/common/GPC_MouseDevice.h b/source/gameengine/GamePlayer/common/GPC_MouseDevice.h index 504df2376bb..24922197723 100644 --- a/source/gameengine/GamePlayer/common/GPC_MouseDevice.h +++ b/source/gameengine/GamePlayer/common/GPC_MouseDevice.h @@ -67,8 +67,6 @@ public: * Call this routine to update the mouse device when a button state changes. * \param button Which button state changes. * \param isDown The new state of the button. - * \param x Position x-coordinate of the cursor at the time of the state change. - * \param y Position y-coordinate of the cursor at the time of the state change. * \return Indication as to whether the event was processed. */ virtual bool ConvertButtonEvent(TButtonId button, bool isDown); |