TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 11:43:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/development' into imageAsset_refactor_rev3

Browse source
This commit is contained in:
marauder2k7 2025-04-05 15:59:02 +01:00
commit 7c4d41ee21
21 changed files with 98 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Engine/source/T3D/assets/LevelAsset.cpp
View file

@ -443,6 +443,7 @@ DefineEngineMethod(LevelAsset, unloadDependencies, void, (), ,
return object->unloadDependencies();
}
#ifdef TORQUE_TOOLS
//-----------------------------------------------------------------------------
// GuiInspectorTypeAssetId
//-----------------------------------------------------------------------------
@ -545,3 +546,5 @@ void GuiInspectorTypeLevelAssetId::consoleInit()
ConsoleBaseType::getType(TypeLevelAssetId)->setInspectorFieldType("GuiInspectorTypeLevelAssetId");
}
#endif