TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-24 22:59:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

MacOS fixes

Browse source 
This fixes an issue where Con::getVariable can't be used in the global scope before the console system is initialized. I'm honestly surprised this error didn't happen on any other platform.
This commit is contained in:
Jeff Hutchinson 2021-08-21 20:48:26 -04:00
parent c04f3ae166
commit 37dc8626f5
3 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/T3D/assets/MaterialAsset.cpp
View file

@ -43,7 +43,7 @@
#include "T3D/assets/assetImporter.h"
StringTableEntry MaterialAsset::smNoMaterialAssetFallback(StringTable->insert(Con::getVariable("$Core::NoMaterialAssetFallback")));
StringTableEntry MaterialAsset::smNoMaterialAssetFallback = NULL;
//-----------------------------------------------------------------------------
@ -145,6 +145,8 @@ void MaterialAsset::consoleInit()
Con::addVariable("$Core::NoMaterialAssetFallback", TypeString, &smNoMaterialAssetFallback,
"The assetId of the material to display when the requested material asset is missing.\n"
"@ingroup GFX\n");
smNoMaterialAssetFallback = StringTable->insert(Con::getVariable("$Core::NoMaterialAssetFallback"));
}
void MaterialAsset::initPersistFields()