diff --git a/.vs/Switch_Toolbox/v15/.suo b/.vs/Switch_Toolbox/v15/.suo index 42229faa..8c1658b0 100644 Binary files a/.vs/Switch_Toolbox/v15/.suo and b/.vs/Switch_Toolbox/v15/.suo differ diff --git a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide index 5e8bab44..f54bec35 100644 Binary files a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide and b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide differ diff --git a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal index 675107c9..25852903 100644 Binary files a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal and b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal differ diff --git a/Switch_FileFormatsMain/FileFormats/BFRES/BFRES.cs b/Switch_FileFormatsMain/FileFormats/BFRES/BFRES.cs index d8bbafc3..d33f2270 100644 --- a/Switch_FileFormatsMain/FileFormats/BFRES/BFRES.cs +++ b/Switch_FileFormatsMain/FileFormats/BFRES/BFRES.cs @@ -174,9 +174,11 @@ namespace FirstPlugin { BfresEditor bfresEditor = (BfresEditor)LibraryGUI.Instance.GetActiveContent(typeof(BfresEditor)); + bool HasModels = BFRESRender.models.Count > 0; + if (bfresEditor == null) { - bfresEditor = new BfresEditor(); + bfresEditor = new BfresEditor(HasModels); bfresEditor.Dock = DockStyle.Fill; LibraryGUI.Instance.LoadEditor(bfresEditor); } diff --git a/Switch_FileFormatsMain/FileFormats/BFRES/Bfres Structs/SubFiles/FTEX.cs b/Switch_FileFormatsMain/FileFormats/BFRES/Bfres Structs/SubFiles/FTEX.cs index 3a1846c8..aed79e51 100644 --- a/Switch_FileFormatsMain/FileFormats/BFRES/Bfres Structs/SubFiles/FTEX.cs +++ b/Switch_FileFormatsMain/FileFormats/BFRES/Bfres Structs/SubFiles/FTEX.cs @@ -133,8 +133,6 @@ namespace Bfres.Structs if (Tex2Swizzle != 0) setting.swizzle = Tex2Swizzle; - setting.swizzle = 0; - importer.LoadSetting(setting); if (importer.ShowDialog() == DialogResult.OK) @@ -194,8 +192,6 @@ namespace Bfres.Structs if (Tex2Swizzle != 0) setting.swizzle = Tex2Swizzle; - setting.swizzle = 0; - importer.LoadSetting(setting); if (ext == ".dds") diff --git a/Switch_FileFormatsMain/GUI/BFRES/BfresEditor.cs b/Switch_FileFormatsMain/GUI/BFRES/BfresEditor.cs index e063a967..69b78daa 100644 --- a/Switch_FileFormatsMain/GUI/BFRES/BfresEditor.cs +++ b/Switch_FileFormatsMain/GUI/BFRES/BfresEditor.cs @@ -32,7 +32,7 @@ namespace FirstPlugin.Forms AnimationPanel animationPanel; - public BfresEditor() + public BfresEditor(bool HasModels) { InitializeComponent(); @@ -57,7 +57,8 @@ namespace FirstPlugin.Forms } stPanel5.Controls.Add(viewport); - stTabControl1.SelectedIndex = 1; + if (HasModels) + stTabControl1.SelectedIndex = 1; } public UserControl GetActiveEditor(Type type) diff --git a/Switch_FileFormatsMain/obj/Release/FirstPlugin.Plg.dll b/Switch_FileFormatsMain/obj/Release/FirstPlugin.Plg.dll index 8c9f05b8..be38b5de 100644 Binary files a/Switch_FileFormatsMain/obj/Release/FirstPlugin.Plg.dll and b/Switch_FileFormatsMain/obj/Release/FirstPlugin.Plg.dll differ diff --git a/Switch_FileFormatsMain/obj/Release/FirstPlugin.Plg.pdb b/Switch_FileFormatsMain/obj/Release/FirstPlugin.Plg.pdb index 17f95c47..d95ac21d 100644 Binary files a/Switch_FileFormatsMain/obj/Release/FirstPlugin.Plg.pdb and b/Switch_FileFormatsMain/obj/Release/FirstPlugin.Plg.pdb differ diff --git a/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache b/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache index 1c1b5904..687fa502 100644 Binary files a/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache and b/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache differ diff --git a/Switch_Toolbox_Library/Forms/Editors/ObjectEditor.cs b/Switch_Toolbox_Library/Forms/Editors/ObjectEditor.cs index 39768e7a..f5d237d8 100644 --- a/Switch_Toolbox_Library/Forms/Editors/ObjectEditor.cs +++ b/Switch_Toolbox_Library/Forms/Editors/ObjectEditor.cs @@ -181,8 +181,6 @@ namespace Switch_Toolbox.Library.Forms if (AnimName.Length > 3) AnimName = AnimName.Substring(3); - Console.WriteLine("AnimName " + AnimName); - Animation running = new Animation(AnimName); running.ReplaceMe((Animation)e.Node); running.Tag = e.Node; @@ -225,7 +223,6 @@ namespace Switch_Toolbox.Library.Forms if (LibraryGUI.Instance.GetAnimationPanel() != null) { - Console.WriteLine("running" + running.Text); LibraryGUI.Instance.GetAnimationPanel().CurrentAnimation = running; } }