From d896a2b99a6b3d4826bd6a1bddff938147df3e3a Mon Sep 17 00:00:00 2001
From: Areloch <Areloch@gmail.com>
Date: Sun, 1 Sep 2024 17:14:08 -0500
Subject: [PATCH] Removed scan-down of subscenes from Scene's getObjectsByClass
 call Properly returned value for SubScene::save()

---
 Engine/source/T3D/Scene.cpp    |  2 +-
 Engine/source/T3D/Scene.h      | 19 +++----------------
 Engine/source/T3D/SubScene.cpp |  1 +
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/Engine/source/T3D/Scene.cpp b/Engine/source/T3D/Scene.cpp
index f10b7baec..95ff6da17 100644
--- 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
index 838b58b54..d99b1f4b9 100644
--- a/Engine/source/T3D/Scene.h
+++ b/Engine/source/T3D/Scene.h
@@ -86,12 +86,12 @@ public:
    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 @@ public:
 
 
 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
index a1cf61dc5..2cd64e9a6 100644
--- 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()