Browse Source

Merge pull request #1256 from Azaezel/alpha41/orphanOops

getPrefabByCHild should skip NULLs
Brian Roberts 1 year ago
parent
commit
848db69ef1
1 changed files with 2 additions and 0 deletions
  1. 2 0
      Engine/source/T3D/prefab.cpp

+ 2 - 0
Engine/source/T3D/prefab.cpp

@@ -460,6 +460,8 @@ void Prefab::_onFileChanged( const Torque::Path &path )
 
 Prefab* Prefab::getPrefabByChild( SimObject *child )
 {
+   if (child == NULL) return NULL;
+
    ChildToPrefabMap::Iterator itr = smChildToPrefabMap.find( child->getId() );
    if ( itr == smChildToPrefabMap.end() )
       return NULL;