From ee2fc4804a1bf85825ac9bf540fb8a2d59bf4e13 Mon Sep 17 00:00:00 2001
From: AzaezelX <quillus@hotmail.com>
Date: Tue, 7 Mar 2023 16:09:11 -0600
Subject: [PATCH] pt2: name conflict resolution for files gened from an ealier
 rev of the autoconvert wizard

---
 ...orGuiGroup.asset.taml => GUIEditorSettingsWindow.asset.taml} | 2 +-
 .../game/tools/resources/ReflectProbePreviewMat.asset.taml      | 2 +-
 ...GuiGroup.asset.taml => WorldEditorSettingsWindow.asset.taml} | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename Templates/BaseGame/game/tools/gui/{EditorSettingsWindow,EditorGuiGroup.asset.taml => GUIEditorSettingsWindow.asset.taml} (78%)
 rename Templates/BaseGame/game/tools/worldEditor/gui/{EditorSettingsWindow,EditorGuiGroup.asset.taml => WorldEditorSettingsWindow.asset.taml} (78%)

diff --git a/Templates/BaseGame/game/tools/gui/EditorSettingsWindow,EditorGuiGroup.asset.taml b/Templates/BaseGame/game/tools/gui/GUIEditorSettingsWindow.asset.taml
similarity index 78%
rename from Templates/BaseGame/game/tools/gui/EditorSettingsWindow,EditorGuiGroup.asset.taml
rename to Templates/BaseGame/game/tools/gui/GUIEditorSettingsWindow.asset.taml
index f9f52ce07..f8682d356 100644
--- a/Templates/BaseGame/game/tools/gui/EditorSettingsWindow,EditorGuiGroup.asset.taml
+++ b/Templates/BaseGame/game/tools/gui/GUIEditorSettingsWindow.asset.taml
@@ -1,7 +1,7 @@
 <GUIAsset
     canSave="true"
     canSaveDynamicFields="true"
-    AssetName="EditorSettingsWindow,EditorGuiGroup"
+    AssetName="GUIEditorSettingsWindow"
     scriptFile="@assetFile=EditorSettingsWindow.ed.gui"
     GUIFile="@assetFile=EditorSettingsWindow.ed.gui"
     VersionId="1" />
diff --git a/Templates/BaseGame/game/tools/resources/ReflectProbePreviewMat.asset.taml b/Templates/BaseGame/game/tools/resources/ReflectProbePreviewMat.asset.taml
index 746181b76..dab28b3eb 100644
--- a/Templates/BaseGame/game/tools/resources/ReflectProbePreviewMat.asset.taml
+++ b/Templates/BaseGame/game/tools/resources/ReflectProbePreviewMat.asset.taml
@@ -9,7 +9,7 @@
         mapTo="ReflectProbePreviewMat">
         <Material.Stages>
             <Stages_beginarray
-                DiffuseMapAsset="Core_Rendering:NoMaterial"
+                DiffuseMapAsset=""
                 diffuseColor="1 1 1 1"
                 roughness="0"
                 metalness="1"/>
diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/EditorSettingsWindow,EditorGuiGroup.asset.taml b/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorSettingsWindow.asset.taml
similarity index 78%
rename from Templates/BaseGame/game/tools/worldEditor/gui/EditorSettingsWindow,EditorGuiGroup.asset.taml
rename to Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorSettingsWindow.asset.taml
index f9f52ce07..76987f5bd 100644
--- a/Templates/BaseGame/game/tools/worldEditor/gui/EditorSettingsWindow,EditorGuiGroup.asset.taml
+++ b/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorSettingsWindow.asset.taml
@@ -1,7 +1,7 @@
 <GUIAsset
     canSave="true"
     canSaveDynamicFields="true"
-    AssetName="EditorSettingsWindow,EditorGuiGroup"
+    AssetName="WorldEditorSettingsWindow"
     scriptFile="@assetFile=EditorSettingsWindow.ed.gui"
     GUIFile="@assetFile=EditorSettingsWindow.ed.gui"
     VersionId="1" />