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

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

6
Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript
View file

@ -2039,13 +2039,17 @@ function MaterialEditorGui::pickedNewMaterialTargetModule( %this, %module )
PE_EmitterEditor.targetModule = %module;
MaterialEditorGui.defaultMaterialFile = %moduleDef.ModulePath @ "/scripts/managedData/materials." @ $TorqueScriptFileExtension;
if(!isDirectory(filePath(MaterialEditorGui.defaultMaterialFile)))
{
AssetBrowser.dirHandler.createFolder(filePath(MaterialEditorGui.defaultMaterialFile));
}
%action = %this.createUndo(ActionCreateNewMaterial, "Create New Material");
%action.object = "";
%material = getUniqueName( "newMaterial" );
new Material(%material)
{
diffuseMap[0] = "core/rendering/images/warnmat";
mapTo = "unmapped_mat";
parentGroup = RootGroup;
};