diff --git a/FModel/MainWindow.xaml b/FModel/MainWindow.xaml index 503e1656..53fef5c7 100644 --- a/FModel/MainWindow.xaml +++ b/FModel/MainWindow.xaml @@ -168,6 +168,9 @@ + diff --git a/FModel/Settings/UserSettings.cs b/FModel/Settings/UserSettings.cs index de6fd2b4..e84fdda0 100644 --- a/FModel/Settings/UserSettings.cs +++ b/FModel/Settings/UserSettings.cs @@ -114,6 +114,13 @@ namespace FModel.Settings set => SetProperty(ref _isAutoOpenSounds, value); } + private bool _isAutoOpenMeshes = true; + public bool IsAutoOpenMeshes + { + get => _isAutoOpenMeshes; + set => SetProperty(ref _isAutoOpenMeshes, value); + } + private bool _isLoggerExpanded = true; public bool IsLoggerExpanded { @@ -518,6 +525,13 @@ namespace FModel.Settings set => SetProperty(ref _autoOpenSounds, value); } + private Hotkey _autoOpenMeshes = new(Key.F8); + public Hotkey AutoOpenMeshes + { + get => _autoOpenMeshes; + set => SetProperty(ref _autoOpenMeshes, value); + } + private Hotkey _addAudio = new(Key.N, ModifierKeys.Control); public Hotkey AddAudio { diff --git a/FModel/ViewModels/CUE4ParseViewModel.cs b/FModel/ViewModels/CUE4ParseViewModel.cs index f54a1c92..27a3c459 100644 --- a/FModel/ViewModels/CUE4ParseViewModel.cs +++ b/FModel/ViewModels/CUE4ParseViewModel.cs @@ -668,11 +668,7 @@ namespace FModel.ViewModels case UStaticMesh: case USkeletalMesh: { - if (UserSettings.Default.IsAutoSaveMeshes) - { - SaveExport(export); - } - else + if (UserSettings.Default.IsAutoOpenMeshes) { Application.Current.Dispatcher.Invoke(() => { @@ -680,6 +676,10 @@ namespace FModel.ViewModels modelViewer.Load(export); }); } + if (UserSettings.Default.IsAutoSaveMeshes) + { + SaveExport(export); + } return true; } case USkeleton when UserSettings.Default.IsAutoSaveMeshes && UserSettings.Default.SaveSkeletonAsMesh: