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

Merge branch 'MiscQOLFixes20210828' of https://github.com/Areloch/Torque3D into Preview4_0

Browse source
This commit is contained in:
Areloch 2021-09-01 17:44:43 -05:00
commit 25a32cba2a
26 changed files with 330 additions and 204 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript
View file

@ -36,7 +36,10 @@ function AssetBrowser::initialize(%this)
new ArrayObject(AssetPreviewArray);
if(!isObject(%this.dirHandler))
{
%this.dirHandler = makedirectoryHandler(AssetBrowser-->filterTree, "cache,shaderCache", "");
%this.dirHandler.currentAddress = "data/";
}
AssetBrowser-->filterTree.buildIconTable( ":tools/classIcons/Prefab:tools/classIcons/Prefab" @
":tools/classIcons/SimSet:tools/classIcons/SimSet");
@ -2090,7 +2093,14 @@ function AssetBrowser::navigateTo(%this, %address, %historyNav)
if(%this.hasLooseFilesInDir())
{
if(EditorSettings.value("Assets/AutoImportLooseFiles", false) && EditorSettings.value("Assets/AutoImport", false))
{
AssetBrowser.autoImportSimpleLooseFiles();
}
else
{
%this-->AutoImportAssetButton.visible = true;
}
}
else
{