Removed scan-down of subscenes from Scene's getObjectsByClass call

Properly returned value for SubScene::save()
TorqueGameEngines · Sep 1, 2024 · d896a2b · d896a2b
1 parent ae8eca4
commit d896a2b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 17 deletions.
diff --git a/Engine/source/T3D/Scene.cpp b/Engine/source/T3D/Scene.cpp
@@ -369,7 +369,7 @@ void Scene::getUtilizedAssetsFromSceneObject(SimObject* object, Vector<StringTab
 }
 
 //
-Vector<SceneObject*> Scene::getObjectsByClass(String className, bool checkSubscenes)
+Vector<SceneObject*> Scene::getObjectsByClass(String className)
 {
    return Vector<SceneObject*>();
 }

diff --git a/Engine/source/T3D/Scene.h b/Engine/source/T3D/Scene.h
@@ -86,12 +86,12 @@ class Scene : public NetObject, public virtual ITickable
    void unpackUpdate(NetConnection *conn, BitStream *stream) override;
 
    //
-   Vector<SceneObject*> getObjectsByClass(String className, bool checkSubscenes);
+   Vector<SceneObject*> getObjectsByClass(String className);
 
    void getUtilizedAssetsFromSceneObject(SimObject* object, Vector<StringTableEntry>* usedAssetsList);
 
    template <class T>
-   Vector<T*> getObjectsByClass(bool checkSubscenes);
+   Vector<T*> getObjectsByClass();
 
    static Scene *getRootScene() 
    { 
@@ -108,7 +108,7 @@ class Scene : public NetObject, public virtual ITickable
 
 
 template <class T>
-Vector<T*> Scene::getObjectsByClass(bool checkSubscenes)
+Vector<T*> Scene::getObjectsByClass()
 {
    Vector<T*> foundObjects;
 
@@ -129,19 +129,6 @@ Vector<T*> Scene::getObjectsByClass(bool checkSubscenes)
          foundObjects.push_back(curObject);
    }
 
-   if (checkSubscenes)
-   {
-      for (U32 i = 0; i < mSubScenes.size(); i++)
-      {
-         Vector<T*> appendList = mSubScenes[i]->getObjectsByClass<T>(true);
-
-         for (U32 a = 0; a < appendList.size(); a++)
-         {
-            foundObjects.push_back(appendList[a]);
-         }
-      }
-   }
-
    return foundObjects;
 }
 #endif
diff --git a/Engine/source/T3D/SubScene.cpp b/Engine/source/T3D/SubScene.cpp
@@ -338,6 +338,7 @@ bool SubScene::save()
    //Finally, save
    saveSuccess = mLevelAsset->saveAsset();
 
+   return saveSuccess;
 }
 
 void SubScene::_onSelected()