diff --git a/src/ObjLoading/Game/T6/Material/JsonMaterialLoader.cpp b/src/ObjLoading/Game/T6/Material/JsonMaterialLoader.cpp index db3d8f61..12998197 100644 --- a/src/ObjLoading/Game/T6/Material/JsonMaterialLoader.cpp +++ b/src/ObjLoading/Game/T6/Material/JsonMaterialLoader.cpp @@ -4,13 +4,13 @@ #include "Game/T6/Json/JsonMaterial.h" #include -#include #include #include using namespace nlohmann; +using namespace T6; -namespace T6 +namespace { class JsonLoader { @@ -362,7 +362,10 @@ namespace T6 IAssetLoadingManager& m_manager; std::vector& m_dependencies; }; +} // namespace +namespace T6 +{ bool LoadMaterialAsJson( std::istream& stream, Material& material, MemoryManager* memory, IAssetLoadingManager* manager, std::vector& dependencies) {