TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 16:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1275 from Azaezel/alpha41/collideCrash

Browse source 
work around collide not returning false with a null object
This commit is contained in:
Brian Roberts 2024-05-07 13:48:45 -05:00 • committed by GitHub
commit b6f250e93c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/gui/worldEditor/worldEditor.cpp
View file

@ -1999,7 +1999,7 @@ void WorldEditor::on3DMouseMove(const Gui3DMouseEvent & event)
if ( !mHitObject ) if ( !mHitObject )
{ {
SceneObject *hitObj = NULL; SceneObject *hitObj = NULL;
if ( collide(event, &hitObj) && !hitObj->isDeleted() && hitObj->isSelectionEnabled() && !objClassIgnored(hitObj) ) if ( collide(event, &hitObj) && hitObj && !hitObj->isDeleted() && hitObj->isSelectionEnabled() && !objClassIgnored(hitObj) )
{ {
mHitObject = hitObj; mHitObject = hitObj;
} }
@ -2060,7 +2060,7 @@ void WorldEditor::on3DMouseDown(const Gui3DMouseEvent & event)
} }
SceneObject *hitObj = NULL; SceneObject *hitObj = NULL;
if ( collide( event, &hitObj ) && hitObj->isSelectionEnabled() && !objClassIgnored( hitObj ) ) if ( collide( event, &hitObj ) && hitObj && hitObj->isSelectionEnabled() && !objClassIgnored( hitObj ) )
{ {
mPossibleHitObject = hitObj; mPossibleHitObject = hitObj;
mNoMouseDrag = true; mNoMouseDrag = true;