TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-14 08:04: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

32
Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPropertiesWindow.ed.gui
View file

@ -821,7 +821,7 @@
MinExtent = "8 2";
canSave = "1";
Visible = "1";
Command = "MaterialEditorGui.updateORMConfigMap(1);";
Command = "MaterialEditorGui.updateTextureMap(\"ORMConfig\",1);";
tooltipprofile = "ToolsGuiDefaultProfile";
ToolTip = "Change the packed spec map for this layer. \n Roughness (R), Ambient Occlusion (G), and Metalness(B))";
hovertime = "1000";
@ -861,7 +861,7 @@
position = "134 34";
Extent = "40 16";
buttonType = "PushButton";
command="MaterialEditorGui.updateORMConfigMap(1);";
Command = "MaterialEditorGui.updateTextureMap(\"ORMConfig\",1);";
};
new GuiBitmapButtonCtrl() {
canSaveDynamicFields = "0";
@ -875,7 +875,7 @@
MinExtent = "8 2";
canSave = "1";
Visible = "1";
Command = "MaterialEditorGui.updateORMConfigMap(0);";
Command = "MaterialEditorGui.updateTextureMap(\"ORMConfig\",0);";
hovertime = "1000";
groupNum = "-1";
buttonType = "PushButton";
@ -1049,7 +1049,7 @@
profile = "ToolsGuiButtonProfile";
visible = "1";
active = "1";
command = "MaterialEditorGui.updateroughMap(1);";
Command = "MaterialEditorGui.updateTextureMap(\"rough\",1);";
tooltipProfile = "GuiToolTipProfile";
tooltip = "Change the Roughness map for this layer.";
hovertime = "1000";
@ -1094,7 +1094,7 @@
profile = "ToolsGuiButtonProfile";
visible = "1";
active = "1";
command = "MaterialEditorGui.updateroughMap(1);";
Command = "MaterialEditorGui.updateTextureMap(\"rough\",1);";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "0";
@ -1118,7 +1118,7 @@
profile = "ToolsGuiButtonProfile";
visible = "1";
active = "1";
command = "MaterialEditorGui.updateroughMap(0);";
Command = "MaterialEditorGui.updateTextureMap(\"rough\",0);";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "0";
@ -1285,7 +1285,7 @@
profile = "ToolsGuiButtonProfile";
visible = "1";
active = "1";
command = "MaterialEditorGui.updateaoMap(1);";
Command = "MaterialEditorGui.updateTextureMap(\"ao\",1);";
tooltipProfile = "GuiToolTipProfile";
tooltip = "Change the AO map for this layer.";
hovertime = "1000";
@ -1330,7 +1330,7 @@
profile = "ToolsGuiButtonProfile";
visible = "1";
active = "1";
command = "MaterialEditorGui.updateaoMap(1);";
Command = "MaterialEditorGui.updateTextureMap(\"ao\",1);";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "0";
@ -1354,7 +1354,7 @@
profile = "ToolsGuiButtonProfile";
visible = "1";
active = "1";
command = "MaterialEditorGui.updateaoMap(0);";
Command = "MaterialEditorGui.updateTextureMap(\"ao\",0);";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "0";
@ -1521,7 +1521,7 @@
profile = "ToolsGuiButtonProfile";
visible = "1";
active = "1";
command = "MaterialEditorGui.updatemetalMap(1);";
Command = "MaterialEditorGui.updateTextureMap(\"metal\",1);";
tooltipProfile = "GuiToolTipProfile";
tooltip = "Change the Metalness Map for this layer.";
hovertime = "1000";
@ -1566,7 +1566,7 @@
profile = "ToolsGuiButtonProfile";
visible = "1";
active = "1";
command = "MaterialEditorGui.updatemetalMap(1);";
Command = "MaterialEditorGui.updateTextureMap(\"metal\",1);";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "0";
@ -1590,7 +1590,7 @@
profile = "ToolsGuiButtonProfile";
visible = "1";
active = "1";
command = "MaterialEditorGui.updatemetalMap(0);";
Command = "MaterialEditorGui.updateTextureMap(\"metal\",0);";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "0";
@ -1773,7 +1773,7 @@
profile = "ToolsGuiButtonProfile";
visible = "1";
active = "1";
command = "MaterialEditorGui.updateglowMap(1);";
Command = "MaterialEditorGui.updateTextureMap(\"glow\",1);";
tooltipProfile = "GuiToolTipProfile";
tooltip = "Change the glowness Map for this layer.";
hovertime = "1000";
@ -1818,7 +1818,7 @@
profile = "ToolsGuiButtonProfile";
visible = "1";
active = "1";
command = "MaterialEditorGui.updateglowMap(1);";
Command = "MaterialEditorGui.updateTextureMap(\"glow\",1);";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "0";
@ -1842,7 +1842,7 @@
profile = "ToolsGuiButtonProfile";
visible = "1";
active = "1";
command = "MaterialEditorGui.updateglowMap(0);";
Command = "MaterialEditorGui.updateTextureMap(\"glow\",0);";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "0";
@ -4720,7 +4720,7 @@
MinExtent = "8 2";
canSave = "1";
Visible = "1";
Command = "materialSelector.showDialog(\"MaterialEditorGui.switchMaterial\");";
Command = "AssetBrowser.showDialog(\"MaterialAsset\", \"MaterialEditorGui.selectMaterialAsset\");";
hovertime = "1000";
bitmap = "tools/gui/images/open-file";
tooltip = "Open Existing Material";