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

Added proper default setting for alwaysPromptModuleTarget editor setting

Browse source 
Swapped the scan checking for editor scripts with dso being preferred first
This commit is contained in:
Areloch 2023-03-18 14:53:42 -05:00
parent 2f40b843d4
commit f9f022a1b9
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -184,6 +184,10 @@ function AssetBrowserPlugin::initSettings( %this )
EditorSettings.setDefaultValue( "AssetImporDefaultConfig", "DefaultConfig" ); EditorSettings.setDefaultValue( "AssetImporDefaultConfig", "DefaultConfig" );
EditorSettings.setDefaultValue( "AutoImport", 1 ); EditorSettings.setDefaultValue( "AutoImport", 1 );
EditorSettings.beginGroup( "New" );
EditorSettings.setDefaultValue( "alwaysPromptModuleTarget", 0 );
EditorSettings.endGroup();
EditorSettings.beginGroup( "Browser" ); EditorSettings.beginGroup( "Browser" );

8
Templates/BaseGame/game/tools/main.tscript
View file

@ -100,12 +100,12 @@ function onStart()
$editors[%i] = getWord( $Tools::loadFirst, %i ); $editors[%i] = getWord( $Tools::loadFirst, %i );
} }
%pattern = $Tools::resourcePath @ "/*/main." @ $TorqueScriptFileExtension; %pattern = $Tools::resourcePath @ "/*/main." @ $TorqueScriptFileExtension @ ".dso";
%folder = findFirstFile( %pattern ); %folder = findFirstFile( %pattern );
if ( %folder $= "") if ( %folder $= "")
{ {
// if we have absolutely no matches for main.tscript, we look for main.tscript.dso // if we have absolutely no matches for main.tscript, we look for main.tscript.dso
%pattern = $Tools::resourcePath @ "/*/main." @ $TorqueScriptFileExtension @ ".dso"; %pattern = $Tools::resourcePath @ "/*/main." @ $TorqueScriptFileExtension;
%folder = findFirstFile( %pattern ); %folder = findFirstFile( %pattern );
} }
while ( %folder !$= "" ) while ( %folder !$= "" )
@ -128,12 +128,12 @@ function onStart()
} }
//Next, scrape through modules and scan for tools subfolders there //Next, scrape through modules and scan for tools subfolders there
%pattern = "data/*/editor." @ $TorqueScriptFileExtension; %pattern = "data/*/editor." @ $TorqueScriptFileExtension @ ".dso";
%folder = findFirstFile( %pattern ); %folder = findFirstFile( %pattern );
if ( %folder $= "") if ( %folder $= "")
{ {
// if we have absolutely no matches for main.tscript, we look for main.tscript.dso // if we have absolutely no matches for main.tscript, we look for main.tscript.dso
%pattern = "data/*/editor." @ $TorqueScriptFileExtension @ ".dso"; %pattern = "data/*/editor." @ $TorqueScriptFileExtension;
%folder = findFirstFile( %pattern ); %folder = findFirstFile( %pattern );
} }
while ( %folder !$= "" ) while ( %folder !$= "" )