diff --git a/.vs/Switch_Toolbox/v15/.suo b/.vs/Switch_Toolbox/v15/.suo index a034f202..96ae31e8 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-wal b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal index 42f09c3f..3a9d535e 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 Structs/SubFiles/FMDL.cs b/Switch_FileFormatsMain/FileFormats/BFRES/Bfres Structs/SubFiles/FMDL.cs index 3e4af93c..0b5e5ea9 100644 --- a/Switch_FileFormatsMain/FileFormats/BFRES/Bfres Structs/SubFiles/FMDL.cs +++ b/Switch_FileFormatsMain/FileFormats/BFRES/Bfres Structs/SubFiles/FMDL.cs @@ -437,7 +437,8 @@ namespace Bfres.Structs Nodes.Clear(); } - public override string ExportFilter => FileFilters.GetFilter(typeof(FMDL)); + public override string ExportFilter => FileFilters.GetFilter(typeof(FMDL), null, true); + public override string ImportFilter => FileFilters.GetFilter(typeof(FMDL)); public override void Export(string FileName) { diff --git a/Switch_FileFormatsMain/GUI/Byaml/CourseMuunt/TurboMunntEditor.Designer.cs b/Switch_FileFormatsMain/GUI/Byaml/CourseMuunt/TurboMunntEditor.Designer.cs index 55a8bf34..726aa3a3 100644 --- a/Switch_FileFormatsMain/GUI/Byaml/CourseMuunt/TurboMunntEditor.Designer.cs +++ b/Switch_FileFormatsMain/GUI/Byaml/CourseMuunt/TurboMunntEditor.Designer.cs @@ -87,7 +87,7 @@ // stPropertyGrid1 // this.stPropertyGrid1.AutoScroll = true; - this.stPropertyGrid1.DisableHintDisplay = true; + this.stPropertyGrid1.ShowHintDisplay = true; this.stPropertyGrid1.Dock = System.Windows.Forms.DockStyle.Fill; this.stPropertyGrid1.Location = new System.Drawing.Point(0, 0); this.stPropertyGrid1.Name = "stPropertyGrid1"; diff --git a/Switch_FileFormatsMain/NodeWrappers/BfresFilters.cs b/Switch_FileFormatsMain/NodeWrappers/BfresFilters.cs index 6c61faac..721fe1d1 100644 --- a/Switch_FileFormatsMain/NodeWrappers/BfresFilters.cs +++ b/Switch_FileFormatsMain/NodeWrappers/BfresFilters.cs @@ -13,6 +13,7 @@ namespace FirstPlugin public static string BNTX_TEX = GetFilter(".bftex", ".dds",".astc", ".png", ".tga", ".jpg", ".tiff", ".gif"); public static string FTEX = GetFilter(".bftex", ".dds", ".dds2", ".png", ".tga", ".jpg", ".tiff", ".gif"); public static string FMDL = GetFilter(".bfmdl", ".dae", ".fbx", ".obj", ".csv"); + public static string FMDL_EXPORT = GetFilter(".bfmdl", ".dae"); public static string FSKL = GetFilter(".bfskl"); public static string FSHP = GetFilter(".bfobj"); public static string BONE = GetFilter(".bfbn"); @@ -30,9 +31,10 @@ namespace FirstPlugin public static string FSCN = GetFilter(".bfscn"); public static string FSHA = GetFilter(".bfspa"); - public static string GetFilter(Type type, object CheckAnimEffect = null) + public static string GetFilter(Type type, object CheckAnimEffect = null, bool IsExporting = false) { if (type == typeof(TextureData)) return BNTX_TEX; + else if (type == typeof(FMDL) && IsExporting) return FMDL_EXPORT; else if (type == typeof(FMDL)) return FMDL; else if (type == typeof(FSHP)) return FSHP; else if (type == typeof(FMAT)) return FMAT; diff --git a/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache b/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache index cab69bc2..566eed06 100644 Binary files a/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache and b/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache differ