Mirrors/Switch-Toolbox
2
0
Fork 0
mirror of https://github.com/KillzXGaming/Switch-Toolbox synced 2024-11-22 04:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Switch to viewport only if models are present. Fix tex2 swizzle value not loading

Browse source
This commit is contained in:
KillzXGaming 2019-03-24 12:12:51 -04:00
parent 0c37b03bb7
commit c8b77411fa
10 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
.vs/Switch_Toolbox/v15/.suo
View file

Binary file not shown.

BIN
.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide
View file

Binary file not shown.

BIN
.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal
View file

Binary file not shown.

4
Switch_FileFormatsMain/FileFormats/BFRES/BFRES.cs
View file

@ -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);
}

4
Switch_FileFormatsMain/FileFormats/BFRES/Bfres Structs/SubFiles/FTEX.cs
View file

@ -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")

5
Switch_FileFormatsMain/GUI/BFRES/BfresEditor.cs
View file

@ -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)

BIN
Switch_FileFormatsMain/obj/Release/FirstPlugin.Plg.dll
View file

Binary file not shown.

BIN
Switch_FileFormatsMain/obj/Release/FirstPlugin.Plg.pdb
View file

Binary file not shown.

BIN
Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache
View file

Binary file not shown.

3
Switch_Toolbox_Library/Forms/Editors/ObjectEditor.cs
View file

@ -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;
}
}