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

Fix NULL pointer deref crashes in WorldEditor::selectObject & WorldEditor::unSelectObject

Browse source
This commit is contained in:
Robert MacGregor 2015-12-02 01:47:29 -05:00
parent 272e3138a0
commit d6226a71ca
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

@ -2810,7 +2810,7 @@ void WorldEditor::clearSelection()
void WorldEditor::selectObject( SimObject *obj ) void WorldEditor::selectObject( SimObject *obj )
{ {
if ( mSelectionLocked || !mSelected ) if ( mSelectionLocked || !mSelected || !obj )
return; return;
// Don't check isSelectionEnabled of SceneObjects here as we // Don't check isSelectionEnabled of SceneObjects here as we
@ -2833,7 +2833,7 @@ void WorldEditor::selectObject( const char* obj )
void WorldEditor::unselectObject( SimObject *obj ) void WorldEditor::unselectObject( SimObject *obj )
{ {
if ( mSelectionLocked || !mSelected ) if ( mSelectionLocked || !mSelected || !obj )
return; return;
if ( !objClassIgnored( obj ) && mSelected->objInSet( obj ) ) if ( !objClassIgnored( obj ) && mSelected->objInSet( obj ) )