INSANEMODE/OpenAssetTools
1
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-06-10 23:08:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix linux build

Browse Source
This commit is contained in:
Jan
2024-04-01 20:48:39 +02:00
parent 0d96213f21
commit 1bc1c12244
4 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderXModel.cpp
View File

@ -1,7 +1,7 @@
#include "AssetLoaderXModel.h"
#include "Game/T6/XModel/JsonXModelLoader.h"
#include "Game/T6/T6.h"
#include "Game/T6/XModel/JsonXModelLoader.h"
#include "Pool/GlobalAssetPool.h"
#include <cstring>

3
src/ObjLoading/Game/T6/XModel/JsonXModelLoader.cpp
View File

@ -6,6 +6,7 @@
#include <format>
#include <iostream>
#include <nlohmann/json.hpp>
#include <vector>
using namespace nlohmann;
using namespace T6;
@ -109,7 +110,7 @@ namespace T6
std::set<XAssetInfoGeneric*> dependenciesSet;
const JsonLoader loader(stream, *memory, *manager, dependenciesSet);
dependencies.assign_range(dependenciesSet);
dependencies.assign(dependenciesSet.cbegin(), dependenciesSet.cend());
return loader.Load(xmodel);
}