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

Standardizes project import copy behavior to validate if we're in-place importing to avoid erroring out needlessly with a new utility function

Browse source 
Fixed wrong variable preventing ImportConfig Editor from refreshing when selecting different configs
Standardized DefaultImportConfig's settings against Legacy Import setting, specifically collision resolution behavior and appending _mat suffix to materials
This commit is contained in:
JeffR 2022-02-25 00:03:33 -06:00
parent da5cb56c83
commit b8b94fdec9
5 changed files with 467 additions and 255 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2491,8 +2491,10 @@ function AssetBrowser::autoImportSimpleLooseFiles(%this)
while( %file !$= "" )
{
if(!strIsMatchExpr("*.asset.taml", %file) && !strIsMatchExpr("*.taml", %file) && !strIsMatchExpr("*.cached.dts", %file))
if(!strIsMatchExpr("*.asset.taml", %file) && !strIsMatchExpr("*.taml", %file) && !strIsMatchExpr("*.cached.dts", %file)
&& !strIsMatchExpr("*.cs", %file) && !strIsMatchExpr("*.tscript", %file) && !strIsMatchExpr("*.module", %file))
{
%aq.clear();
%assetsFound = AssetDatabase.findAssetLooseFile(%aq, %file);
if(%assetsFound == 0)

6
Templates/BaseGame/game/tools/assetBrowser/scripts/assetImportConfigEditor.tscript
View file

@ -33,8 +33,8 @@ function AssetImportConfigEditor::apply(%this)
function AssetImportConfigList::onSelect( %this, %id, %text )
{
ImportOptionsConfigList.clearFields();
ImportOptionsConfigList.setAutoUpdate(false); //we don't want to be updating every time we add a field in here
AssetImportConfigEditorInspector.clearFields();
AssetImportConfigEditorInspector.setAutoUpdate(false); //we don't want to be updating every time we add a field in here
%this.currentConfig = %text;
@ -46,7 +46,7 @@ function AssetImportConfigList::onSelect( %this, %id, %text )
%this.populateConfigListByGroup("Animations");
//%this.populateConfigListByGroup("Collision");
ImportOptionsConfigList.update();
AssetImportConfigEditorInspector.update();
}
function AssetImportConfigList::populateConfigListByGroup(%this, %groupName)