From db07574a61561cdec2a71943414f80c39ab0a380 Mon Sep 17 00:00:00 2001 From: Asval Date: Sat, 28 Oct 2023 19:40:36 +0200 Subject: [PATCH] FModel v.4.4.3.4 --- FModel/FModel.csproj | 6 +++--- FModel/Settings/UserSettings.cs | 8 ++++---- FModel/ViewModels/CUE4ParseViewModel.cs | 2 +- FModel/Views/SettingsView.xaml | 4 ++-- FModel/Views/Snooper/Models/UModel.cs | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/FModel/FModel.csproj b/FModel/FModel.csproj index 52305c1c..e8971df2 100644 --- a/FModel/FModel.csproj +++ b/FModel/FModel.csproj @@ -5,9 +5,9 @@ net6.0-windows true FModel.ico - 4.4.3.3 - 4.4.3.3 - 4.4.3.3 + 4.4.3.4 + 4.4.3.4 + 4.4.3.4 false true win-x64 diff --git a/FModel/Settings/UserSettings.cs b/FModel/Settings/UserSettings.cs index 46f6e57a..5dc4eb85 100644 --- a/FModel/Settings/UserSettings.cs +++ b/FModel/Settings/UserSettings.cs @@ -424,11 +424,11 @@ public bool SaveMorphTargets set => SetProperty(ref _saveMorphTargets, value); } - private bool _saveMeshMaterials = true; - public bool SaveMeshMaterials + private bool _saveEmbeddedMaterials = true; + public bool SaveEmbeddedMaterials { - get => _saveMeshMaterials; - set => SetProperty(ref _saveMeshMaterials, value); + get => _saveEmbeddedMaterials; + set => SetProperty(ref _saveEmbeddedMaterials, value); } private bool _saveSkeletonAsMesh; diff --git a/FModel/ViewModels/CUE4ParseViewModel.cs b/FModel/ViewModels/CUE4ParseViewModel.cs index e56c66ee..473ad1fb 100644 --- a/FModel/ViewModels/CUE4ParseViewModel.cs +++ b/FModel/ViewModels/CUE4ParseViewModel.cs @@ -986,7 +986,7 @@ private void SaveExport(UObject export, bool auto) SocketFormat = UserSettings.Default.SocketExportFormat, Platform = UserSettings.Default.CurrentDir.TexturePlatform, ExportMorphTargets = UserSettings.Default.SaveMorphTargets, - ExportMaterials = UserSettings.Default.SaveMeshMaterials + ExportMaterials = UserSettings.Default.SaveEmbeddedMaterials }; var toSave = new Exporter(export, exportOptions); diff --git a/FModel/Views/SettingsView.xaml b/FModel/Views/SettingsView.xaml index f8176926..f5373a08 100644 --- a/FModel/Views/SettingsView.xaml +++ b/FModel/Views/SettingsView.xaml @@ -387,9 +387,9 @@ IsChecked="{Binding PreviewWorlds, Source={x:Static local:Settings.UserSettings.Default}, Mode=TwoWay}" Style="{DynamicResource {x:Static adonisUi:Styles.ToggleSwitch}}" Margin="0 5 0 5"/> - + diff --git a/FModel/Views/Snooper/Models/UModel.cs b/FModel/Views/Snooper/Models/UModel.cs index fc4302be..6bff5537 100644 --- a/FModel/Views/Snooper/Models/UModel.cs +++ b/FModel/Views/Snooper/Models/UModel.cs @@ -366,7 +366,7 @@ public bool Save(out string label, out string savedFilePath) SocketFormat = UserSettings.Default.SocketExportFormat, Platform = UserSettings.Default.CurrentDir.TexturePlatform, ExportMorphTargets = UserSettings.Default.SaveMorphTargets, - ExportMaterials = UserSettings.Default.SaveMeshMaterials + ExportMaterials = UserSettings.Default.SaveEmbeddedMaterials }; var toSave = new Exporter(_export, exportOptions); return toSave.TryWriteToDir(new DirectoryInfo(UserSettings.Default.ModelDirectory), out label, out savedFilePath);