浏览代码

Merge pull request #1256 from Azaezel/alpha41/orphanOops

getPrefabByCHild should skip NULLs
Brian Roberts 1 年之前
父节点
当前提交
848db69ef1
共有 1 个文件被更改,包括 2 次插入0 次删除
  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;