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

Added changes missed via merge failures.

Browse source 
Removed some unused files/references that were causing errors, related to issues #502 & #512
This commit is contained in:
Areloch 2021-07-20 20:05:49 -05:00
parent 5525f8ecdd
commit 3e131f5b8e
78 changed files with 1812 additions and 1832 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Templates/BaseGame/game/tools/decalEditor/decalEditorGui.tscript
View file

@ -158,6 +158,15 @@ function RetargetDecalButton::onClick( %this )
function NewDecalButton::onClick( %this )
{
AssetBrowser_SelectModule.showDialog("DecalEditorGui.pickedNewDecalTargetModule");
AssetBrowser_SelectModuleWindow.selectWindow();
}
function DecalEditorGui::pickedNewDecalTargetModule(%this, %module)
{
%moduleDef = ModuleDatabase.findModule(%module);
$decalDataFile = %moduleDef.ModulePath @ "/scripts/managedData/managedDecalData." @ $TorqueScriptFileExtension;
%name = getUniqueName( "NewDecalData" );
%str = "datablock DecalData( " @ %name @ " ) { Material = \"WarningMaterial\"; };";

2
Templates/BaseGame/game/tools/decalEditor/main.tscript
View file

@ -24,7 +24,7 @@ function initializeDecalEditor()
{
echo(" % - Initializing Decal Editor");
$decalDataFile = "art/decals/managedDecalData." @ $TorqueScriptFileExtension;
$decalDataFile = "data/managedDecalData." @ $TorqueScriptFileExtension;
exec( "./decalEditor." @ $TorqueScriptFileExtension );
exec( "./decalEditorGui.gui" );