diff --git a/.vs/Switch_Toolbox/v15/.suo b/.vs/Switch_Toolbox/v15/.suo index df00306c..8afc0654 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 495a25a9..1144dc73 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 42df5db3..56295b13 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/Audio/Archives/BARS.cs b/Switch_FileFormatsMain/FileFormats/Audio/Archives/BARS.cs index 0d50c1de..80905a53 100644 --- a/Switch_FileFormatsMain/FileFormats/Audio/Archives/BARS.cs +++ b/Switch_FileFormatsMain/FileFormats/Audio/Archives/BARS.cs @@ -227,7 +227,7 @@ namespace FirstPlugin bars = new BarsLib.BARS(stream); if (bars.AmtaList.Count > 0) - Nodes.Add("AMTA"); + Nodes.Add("Meta Data"); if (bars.audioList.Count > 0) Nodes.Add("Audio"); diff --git a/Switch_Toolbox_Library/Generics/RenderableTex.cs b/Switch_Toolbox_Library/Generics/RenderableTex.cs index 51e8a0b8..ec8d675c 100644 --- a/Switch_Toolbox_Library/Generics/RenderableTex.cs +++ b/Switch_Toolbox_Library/Generics/RenderableTex.cs @@ -147,7 +147,7 @@ namespace Switch_Toolbox.Library.Rendering //While shaders could prevent this, converting is easier and works fine across all editors if (Runtime.UseDirectXTexDecoder) { - ImageData.Add(STGenericTexture.DecodeBlock(ImageData[0], + ImageData[0] = (STGenericTexture.DecodeBlock(ImageData[0], GenericTexture.Width, GenericTexture.Height, GenericTexture.Format, @@ -164,7 +164,7 @@ namespace Switch_Toolbox.Library.Rendering case TEX_FORMAT.BC5_SNORM: pixelInternalFormat = PixelInternalFormat.CompressedRgRgtc2; - ImageData.Add(DDSCompressor.DecompressBC5(ImageData[0], + ImageData[0] = (DDSCompressor.DecompressBC5(ImageData[0], (int)GenericTexture.Width, (int)GenericTexture.Height, true, true)); pixelInternalFormat = PixelInternalFormat.Rgba; pixelFormat = OpenTK.Graphics.OpenGL.PixelFormat.Rgba; @@ -195,11 +195,11 @@ namespace Switch_Toolbox.Library.Rendering default: if (Runtime.UseDirectXTexDecoder) { - ImageData.Add(STGenericTexture.DecodeBlock(ImageData[0], + ImageData[0] = STGenericTexture.DecodeBlock(ImageData[0], GenericTexture.Width, GenericTexture.Height, GenericTexture.Format, - GenericTexture.PlatformSwizzle)); + GenericTexture.PlatformSwizzle); pixelInternalFormat = PixelInternalFormat.Rgba; pixelFormat = OpenTK.Graphics.OpenGL.PixelFormat.Rgba; diff --git a/Switch_Toolbox_Library/Generics/STSkeleton.cs b/Switch_Toolbox_Library/Generics/STSkeleton.cs index 9bfca4bf..4bd4d527 100644 --- a/Switch_Toolbox_Library/Generics/STSkeleton.cs +++ b/Switch_Toolbox_Library/Generics/STSkeleton.cs @@ -183,9 +183,11 @@ namespace Switch_Toolbox.Library { CheckBuffers(); - if (!Runtime.OpenTKInitialized || !Runtime.renderBones) + if (!Runtime.OpenTKInitialized || !Runtime.renderBones || !Visible) return; + Console.WriteLine($"SKEL Visible " + Visible); + SF.Shader shader = OpenTKSharedResources.shaders["BONE"]; shader.UseProgram();