AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-12-14 23:56:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Applied a bunch of fixes to get the current game exporter functionality working with the resource store system

Browse Source
This commit is contained in:
parax0
2016-07-04 20:28:17 -06:00
parent 2f2ec13ced
commit 24c5ad5cd7
28 changed files with 318 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Core/Resource/Script/CScriptTemplate.cpp
View File

@@ -166,7 +166,7 @@ CResource* CScriptTemplate::FindDisplayAsset(CPropertyStruct *pProperties, u32&
if (it->AssetSource == SEditorAsset::eFile)
{
TString Path = "../resources/" + it->AssetLocation;
pRes = gResourceStore.LoadResource(Path);
pRes = gpResourceStore->LoadResource(Path);
}
// Property
@@ -216,7 +216,7 @@ CCollisionMeshGroup* CScriptTemplate::FindCollision(CPropertyStruct *pProperties
if (it->AssetSource == SEditorAsset::eFile)
{
TString path = "../resources/" + it->AssetLocation;
pRes = gResourceStore.LoadResource(path);
pRes = gpResourceStore->LoadResource(path);
}
// Property