|
@@ -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 ) )
|