From e7b23792f880f1de50b123c1d32376483dbeba93 Mon Sep 17 00:00:00 2001 From: cutealien Date: Mon, 7 Mar 2016 20:53:30 +0000 Subject: [PATCH] Prevent crashes in fps and maya camera animators when the device has no CursorControl (still can't control those cameras without cursor certainly). git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@5272 dfc29bdd-3216-0410-991c-e03cc46cb475 --- source/Irrlicht/CSceneNodeAnimatorCameraFPS.cpp | 3 ++- source/Irrlicht/CSceneNodeAnimatorCameraMaya.cpp | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/source/Irrlicht/CSceneNodeAnimatorCameraFPS.cpp b/source/Irrlicht/CSceneNodeAnimatorCameraFPS.cpp index ba7548bf..85a27bbb 100644 --- a/source/Irrlicht/CSceneNodeAnimatorCameraFPS.cpp +++ b/source/Irrlicht/CSceneNodeAnimatorCameraFPS.cpp @@ -82,7 +82,8 @@ bool CSceneNodeAnimatorCameraFPS::OnEvent(const SEvent& evt) case EET_MOUSE_INPUT_EVENT: if (evt.MouseInput.Event == EMIE_MOUSE_MOVED) { - CursorPos = CursorControl->getRelativePosition(); + if ( CursorControl ) + CursorPos = CursorControl->getRelativePosition(); return true; } break; diff --git a/source/Irrlicht/CSceneNodeAnimatorCameraMaya.cpp b/source/Irrlicht/CSceneNodeAnimatorCameraMaya.cpp index 977a0aff..ae8a8cb4 100644 --- a/source/Irrlicht/CSceneNodeAnimatorCameraMaya.cpp +++ b/source/Irrlicht/CSceneNodeAnimatorCameraMaya.cpp @@ -80,7 +80,10 @@ bool CSceneNodeAnimatorCameraMaya::OnEvent(const SEvent& event) MouseKeys[2] = event.MouseInput.isRightPressed(); MouseKeys[1] = event.MouseInput.isMiddlePressed(); - MousePos = CursorControl->getRelativePosition(); + if ( CursorControl ) + { + MousePos = CursorControl->getRelativePosition(); + } break; case EMIE_MOUSE_WHEEL: case EMIE_LMOUSE_DOUBLE_CLICK: