zaki
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
master
cutealien 2016-03-07 20:53:30 +00:00
parent 49b00b631a
commit e7b23792f8
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/Irrlicht/CSceneNodeAnimatorCameraFPS.cpp
View File

@ -82,7 +82,8 @@ bool CSceneNodeAnimatorCameraFPS::OnEvent(const SEvent& evt)
case EET_MOUSE_INPUT_EVENT: case EET_MOUSE_INPUT_EVENT:
if (evt.MouseInput.Event == EMIE_MOUSE_MOVED) if (evt.MouseInput.Event == EMIE_MOUSE_MOVED)
{ {
CursorPos = CursorControl->getRelativePosition(); if ( CursorControl )
CursorPos = CursorControl->getRelativePosition();
return true; return true;
} }
break; break;

5
source/Irrlicht/CSceneNodeAnimatorCameraMaya.cpp
View File

@ -80,7 +80,10 @@ bool CSceneNodeAnimatorCameraMaya::OnEvent(const SEvent& event)
MouseKeys[2] = event.MouseInput.isRightPressed(); MouseKeys[2] = event.MouseInput.isRightPressed();
MouseKeys[1] = event.MouseInput.isMiddlePressed(); MouseKeys[1] = event.MouseInput.isMiddlePressed();
MousePos = CursorControl->getRelativePosition(); if ( CursorControl )
{
MousePos = CursorControl->getRelativePosition();
}
break; break;
case EMIE_MOUSE_WHEEL: case EMIE_MOUSE_WHEEL:
case EMIE_LMOUSE_DOUBLE_CLICK: case EMIE_LMOUSE_DOUBLE_CLICK: