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

pt2: name conflict resolution for files gened from an ealier rev of the autoconvert wizard

Browse source
This commit is contained in:
AzaezelX 2023-03-07 16:09:11 -06:00
parent 9a5e0829ff
commit ee2fc4804a
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Templates/BaseGame/game/tools/gui/EditorSettingsWindow,EditorGuiGroup.asset.taml → Templates/BaseGame/game/tools/gui/GUIEditorSettingsWindow.asset.taml
View file

@ -1,7 +1,7 @@
<GUIAsset <GUIAsset
canSave="true" canSave="true"
canSaveDynamicFields="true" canSaveDynamicFields="true"
AssetName="EditorSettingsWindow,EditorGuiGroup" AssetName="GUIEditorSettingsWindow"
scriptFile="@assetFile=EditorSettingsWindow.ed.gui" scriptFile="@assetFile=EditorSettingsWindow.ed.gui"
GUIFile="@assetFile=EditorSettingsWindow.ed.gui" GUIFile="@assetFile=EditorSettingsWindow.ed.gui"
VersionId="1" /> VersionId="1" />

2
Templates/BaseGame/game/tools/resources/ReflectProbePreviewMat.asset.taml
View file

@ -9,7 +9,7 @@
mapTo="ReflectProbePreviewMat"> mapTo="ReflectProbePreviewMat">
<Material.Stages> <Material.Stages>
<Stages_beginarray <Stages_beginarray
DiffuseMapAsset="Core_Rendering:NoMaterial" DiffuseMapAsset=""
diffuseColor="1 1 1 1" diffuseColor="1 1 1 1"
roughness="0" roughness="0"
metalness="1"/> metalness="1"/>

2
Templates/BaseGame/game/tools/worldEditor/gui/EditorSettingsWindow,EditorGuiGroup.asset.taml → Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorSettingsWindow.asset.taml
View file

@ -1,7 +1,7 @@
<GUIAsset <GUIAsset
canSave="true" canSave="true"
canSaveDynamicFields="true" canSaveDynamicFields="true"
AssetName="EditorSettingsWindow,EditorGuiGroup" AssetName="WorldEditorSettingsWindow"
scriptFile="@assetFile=EditorSettingsWindow.ed.gui" scriptFile="@assetFile=EditorSettingsWindow.ed.gui"
GUIFile="@assetFile=EditorSettingsWindow.ed.gui" GUIFile="@assetFile=EditorSettingsWindow.ed.gui"
VersionId="1" /> VersionId="1" />