From ab730462b1294c1cfe5f1e6fec212f6fbc8e3297 Mon Sep 17 00:00:00 2001 From: Razmoth <32140579+Razmoth@users.noreply.github.com> Date: Tue, 20 Feb 2024 23:04:56 +0400 Subject: [PATCH] - [CLI] allow exported flags to override configs. --- AssetStudio.CLI/Program.cs | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/AssetStudio.CLI/Program.cs b/AssetStudio.CLI/Program.cs index 0ba3fa1..df70bee 100644 --- a/AssetStudio.CLI/Program.cs +++ b/AssetStudio.CLI/Program.cs @@ -51,6 +51,8 @@ namespace AssetStudio.CLI var classTypeFilter = Array.Empty(); if (!o.TypeFilter.IsNullOrEmpty()) { + var exportTexture2D = false; + var exportMaterial = false; var classTypeFilterList = new List(); for (int i = 0; i < o.TypeFilter.Length; i++) { @@ -70,6 +72,15 @@ namespace AssetStudio.CLI } type = (ClassIDType)Enum.Parse(typeof(ClassIDType), typeStr, true); + + if (type == ClassIDType.Texture2D) + { + exportTexture2D = flag.HasFlag(TypeFlag.Export); + } + else if (type == ClassIDType.Material) + { + exportMaterial = flag.HasFlag(TypeFlag.Export); + } TypeFlags.SetType(type, flag.HasFlag(TypeFlag.Parse), flag.HasFlag(TypeFlag.Export)); @@ -86,10 +97,10 @@ namespace AssetStudio.CLI if (ClassIDType.GameObject.CanExport() || ClassIDType.Animator.CanExport()) { - TypeFlags.SetType(ClassIDType.Texture2D, true, false); + TypeFlags.SetType(ClassIDType.Texture2D, true, exportTexture2D); if (Settings.Default.exportMaterials) { - TypeFlags.SetType(ClassIDType.Material, true, false); + TypeFlags.SetType(ClassIDType.Material, true, exportMaterial); } if (ClassIDType.GameObject.CanExport()) {