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 Scene::getObjectsByClass(String className, bool checkSubscenes) +Vector Scene::getObjectsByClass(String className) { return Vector(); } 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 getObjectsByClass(String className, bool checkSubscenes); + Vector getObjectsByClass(String className); void getUtilizedAssetsFromSceneObject(SimObject* object, Vector* usedAssetsList); template - Vector getObjectsByClass(bool checkSubscenes); + Vector getObjectsByClass(); static Scene *getRootScene() { @@ -108,7 +108,7 @@ public: template -Vector Scene::getObjectsByClass(bool checkSubscenes) +Vector Scene::getObjectsByClass() { Vector foundObjects; @@ -129,19 +129,6 @@ Vector Scene::getObjectsByClass(bool checkSubscenes) foundObjects.push_back(curObject); } - if (checkSubscenes) - { - for (U32 i = 0; i < mSubScenes.size(); i++) - { - Vector appendList = mSubScenes[i]->getObjectsByClass(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()