load mat layers from settings

4sval · Feb 25, 2023 · 2e18097 · 2e18097
1 parent 5d730f0
commit 2e18097
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/CUE4Parse b/CUE4Parse
diff --git a/FModel/Views/Snooper/Options.cs b/FModel/Views/Snooper/Options.cs
@@ -31,7 +31,7 @@ public class Options
 
     public readonly Dictionary<string, Texture> Icons;
 
-    private ETexturePlatform _platform;
+    private readonly ETexturePlatform _platform;
 
     public Options()
     {

diff --git a/FModel/Views/Snooper/Shading/Material.cs b/FModel/Views/Snooper/Shading/Material.cs
@@ -7,6 +7,7 @@
 using CUE4Parse.UE4.Objects.Core.Math;
 using CUE4Parse.UE4.Objects.Core.Misc;
 using FModel.Extensions;
+using FModel.Settings;
 using FModel.Views.Snooper.Models;
 using ImGuiNET;
 using OpenTK.Graphics.OpenGL4;
@@ -66,7 +67,7 @@ public void SwapMaterial(UMaterialInterface unrealMaterial)
     {
         Name = unrealMaterial.Name;
         Path = unrealMaterial.GetPathName();
-        unrealMaterial.GetParams(Parameters, EMaterialFormat.AllLayers);
+        unrealMaterial.GetParams(Parameters, UserSettings.Default.MaterialExportFormat);
     }
 
     public void Setup(Options options, int uvCount)

diff --git a/FModel/Views/Snooper/Shading/TextureHelper.cs b/FModel/Views/Snooper/Shading/TextureHelper.cs
@@ -21,6 +21,7 @@ public static void FixChannels(UTexture2D o, FTexture2DMipMap mip, ref byte[] da
             // B: Metallic
             case "hk_project":
             case "cosmicshake":
+            case "phoenix":
             {
                 unsafe
                 {
@@ -42,7 +43,6 @@ public static void FixChannels(UTexture2D o, FTexture2DMipMap mip, ref byte[] da
             case "shootergame":
             case "divineknockout":
             case "moonman":
-            case "marsman":
             {
                 unsafe
                 {