FModel v.4.4.3.4

4sval · Oct 28, 2023 · db07574 · db07574
1 parent 73e027c
commit db07574
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/FModel/FModel.csproj b/FModel/FModel.csproj
@@ -5,9 +5,9 @@
  <TargetFramework>net6.0-windows</TargetFramework>
  <UseWPF>true</UseWPF>
  <ApplicationIcon>FModel.ico</ApplicationIcon>
- <Version>4.4.3.3</Version>
- <AssemblyVersion>4.4.3.3</AssemblyVersion>
- <FileVersion>4.4.3.3</FileVersion>
+ <Version>4.4.3.4</Version>
+ <AssemblyVersion>4.4.3.4</AssemblyVersion>
+ <FileVersion>4.4.3.4</FileVersion>
  <IsPackable>false</IsPackable>
  <IsPublishable>true</IsPublishable>
  <RuntimeIdentifier>win-x64</RuntimeIdentifier>

diff --git 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
@@ -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
@@ -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"/>
 
- <TextBlock Grid.Row="10" Grid.Column="0" Text="Save Materials in Meshes" VerticalAlignment="Center" Margin="0 0 0 5" />
+ <TextBlock Grid.Row="10" Grid.Column="0" Text="Save Materials Embedded within Meshes" VerticalAlignment="Center" Margin="0 0 0 5" />
  <CheckBox Grid.Row="10" Grid.Column="2" Grid.ColumnSpan="3" Content="{Binding IsChecked, RelativeSource={RelativeSource Self}, Converter={x:Static converters:BoolToToggleConverter.Instance}}"
- IsChecked="{Binding SaveMeshMaterials, Source={x:Static local:Settings.UserSettings.Default}, Mode=TwoWay}"
+ IsChecked="{Binding SaveEmbeddedMaterials, Source={x:Static local:Settings.UserSettings.Default}, Mode=TwoWay}"
  Style="{DynamicResource {x:Static adonisUi:Styles.ToggleSwitch}}" Margin="0 5 0 5"/>
 
  <TextBlock Grid.Row="11" Grid.Column="0" Text="Save Morph Targets in Meshes" VerticalAlignment="Center" Margin="0 0 0 5" />

diff --git 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);