TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 16:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'Preview4_0_Devhead' into mac-font-stuff

Browse source
This commit is contained in:
Jeff Hutchinson 2021-08-21 21:12:02 -04:00
commit 8ebde0e916
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/ImageAsset.cpp
View file

@ -52,7 +52,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
StringTableEntry ImageAsset::smNoImageAssetFallback(StringTable->insert(Con::getVariable("$Core::NoImageAssetFallback"))); StringTableEntry ImageAsset::smNoImageAssetFallback = NULL;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -147,6 +147,8 @@ void ImageAsset::consoleInit()
Con::addVariable("$Core::NoImageAssetFallback", TypeString, &smNoImageAssetFallback, Con::addVariable("$Core::NoImageAssetFallback", TypeString, &smNoImageAssetFallback,
"The assetId of the texture to display when the requested image asset is missing.\n" "The assetId of the texture to display when the requested image asset is missing.\n"
"@ingroup GFX\n"); "@ingroup GFX\n");
smNoImageAssetFallback = StringTable->insert(Con::getVariable("$Core::NoImageAssetFallback"));
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

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

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

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

@ -50,7 +50,7 @@
#include "ts/tsLastDetail.h" #include "ts/tsLastDetail.h"
#endif #endif
StringTableEntry ShapeAsset::smNoShapeAssetFallback(StringTable->insert(Con::getVariable("$Core::NoShapeAssetFallback"))); StringTableEntry ShapeAsset::smNoShapeAssetFallback = NULL;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -146,6 +146,8 @@ void ShapeAsset::consoleInit()
Con::addVariable("$Core::NoShapeAssetFallback", TypeString, &smNoShapeAssetFallback, Con::addVariable("$Core::NoShapeAssetFallback", TypeString, &smNoShapeAssetFallback,
"The assetId of the shape to display when the requested shape asset is missing.\n" "The assetId of the shape to display when the requested shape asset is missing.\n"
"@ingroup GFX\n"); "@ingroup GFX\n");
smNoShapeAssetFallback = StringTable->insert(Con::getVariable("$Core::NoShapeAssetFallback"));
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------