From 810863dbb42a84714881ede609c0e0eb8ce11bdb Mon Sep 17 00:00:00 2001 From: GMatrixGames Date: Wed, 28 Jul 2021 16:47:40 -0400 Subject: [PATCH] Inline with CUE4Parse update --- CUE4Parse | 2 +- FModel/ViewModels/CUE4ParseViewModel.cs | 2 +- FModel/ViewModels/ModelViewerViewModel.cs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CUE4Parse b/CUE4Parse index 8a394c18..9d067e49 160000 --- a/CUE4Parse +++ b/CUE4Parse @@ -1 +1 @@ -Subproject commit 8a394c18099a63f3de83a9f34c3d055fe808f5d0 +Subproject commit 9d067e491710678dbb396ba3c58a57922bdfeecb diff --git a/FModel/ViewModels/CUE4ParseViewModel.cs b/FModel/ViewModels/CUE4ParseViewModel.cs index 53c94136..0bf6a794 100644 --- a/FModel/ViewModels/CUE4ParseViewModel.cs +++ b/FModel/ViewModels/CUE4ParseViewModel.cs @@ -561,7 +561,7 @@ namespace FModel.ViewModels trigger.Text.EndsWith("TF_Nearest", StringComparison.OrdinalIgnoreCase); TabControl.SelectedTab.ImageRender = bNearest ? BitmapScalingMode.NearestNeighbor : BitmapScalingMode.Linear; - TabControl.SelectedTab.SetImage(texture.Decode(bNearest)); + TabControl.SelectedTab.SetImage(texture.Decode()); return true; } case UAkMediaAssetData: diff --git a/FModel/ViewModels/ModelViewerViewModel.cs b/FModel/ViewModels/ModelViewerViewModel.cs index 4e8f1b0d..339a1c24 100644 --- a/FModel/ViewModels/ModelViewerViewModel.cs +++ b/FModel/ViewModels/ModelViewerViewModel.cs @@ -114,7 +114,7 @@ namespace FModel.ViewModels private void LoadStaticMesh(UStaticMesh mesh) { - if (!mesh.TryConvert(out var convertedMesh) || convertedMesh.LODs.Length <= 0) + if (!mesh.TryConvert(out var convertedMesh) || convertedMesh.LODs.Count <= 0) { return; } @@ -139,7 +139,7 @@ namespace FModel.ViewModels private void LoadSkeletalMesh(USkeletalMesh mesh) { - if (!mesh.TryConvert(out var convertedMesh) || convertedMesh.LODs.Length <= 0) + if (!mesh.TryConvert(out var convertedMesh) || convertedMesh.LODs.Count <= 0) { return; }