From 9581ca7a12e6f847f33e5b6457649d38d966cd90 Mon Sep 17 00:00:00 2001
From: iAmAsval <valentinbaudry64@gmail.com>
Date: Sat, 4 Dec 2021 00:13:49 +0100
Subject: [PATCH] lol I didn't commit CUE4Parse last time

---
 CUE4Parse                                 | 2 +-
 FModel/ViewModels/Commands/MenuCommand.cs | 8 ++++++--
 FModel/ViewModels/ModelViewerViewModel.cs | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/CUE4Parse b/CUE4Parse
index 20b76090..2f2e881f 160000
--- a/CUE4Parse
+++ b/CUE4Parse
@@ -1 +1 @@
-Subproject commit 20b76090cb5309be5623082eaef801791ef8ae18
+Subproject commit 2f2e881f50ce8b1fb27b5831227169df1720e436
diff --git a/FModel/ViewModels/Commands/MenuCommand.cs b/FModel/ViewModels/Commands/MenuCommand.cs
index 34609b57..d0778b7f 100644
--- a/FModel/ViewModels/Commands/MenuCommand.cs
+++ b/FModel/ViewModels/Commands/MenuCommand.cs
@@ -47,6 +47,10 @@ namespace FModel.ViewModels.Commands
                 case "Settings":
                     Helper.OpenWindow<AdonisWindow>("Settings", () => new SettingsView().Show());
                     break;
+                case "ModelSettings":
+                    UserSettings.Default.LastOpenedSettingTab = contextViewModel.CUE4Parse.Game == FGame.FortniteGame ? 2 : 1;
+                    Helper.OpenWindow<AdonisWindow>("Settings", () => new SettingsView().Show());
+                    break;
                 case "Help_About":
                     Helper.OpenWindow<AdonisWindow>("About", () => new About().Show());
                     break;
@@ -101,9 +105,9 @@ namespace FModel.ViewModels.Commands
                 parent.IsExpanded = isExpanded;
                 Thread.Sleep(10);
             }
-            
+
             cancellationToken.ThrowIfCancellationRequested();
             foreach (var f in parent.Folders) LoopFolders(cancellationToken, f, isExpanded);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/FModel/ViewModels/ModelViewerViewModel.cs b/FModel/ViewModels/ModelViewerViewModel.cs
index d49f500d..decc2d93 100644
--- a/FModel/ViewModels/ModelViewerViewModel.cs
+++ b/FModel/ViewModels/ModelViewerViewModel.cs
@@ -321,7 +321,7 @@ namespace FModel.ViewModels
             var isRendering = !parameters.IsNull;
             if (isRendering)
             {
-                if (parameters.HasNoTopDiffuseTexture && parameters.DiffuseColor is { A: > 0 } diffuseColor)
+                if (!parameters.HasTopDiffuseTexture && parameters.DiffuseColor is { A: > 0 } diffuseColor)
                 {
                     Application.Current.Dispatcher.Invoke(() => m.AlbedoColor = new Color4(diffuseColor.R, diffuseColor.G, diffuseColor.B, diffuseColor.A));
                 }
@@ -451,7 +451,7 @@ namespace FModel.ViewModels
                     });
                 }
 
-                if (parameters.Emissive is UTexture2D emissive && parameters.EmissiveColor is { A: > 0 } emissiveColor)
+                if (parameters.HasTopEmissiveTexture && parameters.Emissive is UTexture2D emissive && parameters.EmissiveColor is { A: > 0 } emissiveColor)
                 {
                     var s = emissive.Decode()?.Encode().AsStream();
                     var c = new Color4(emissiveColor.R, emissiveColor.G, emissiveColor.B, emissiveColor.A);