Skip to content

Commit

Permalink
Update v3.0.7.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Lunaretic committed Jul 18, 2024
2 parents e12c139 + eab3625 commit 6ac6096
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 6 deletions.
6 changes: 3 additions & 3 deletions FFXIV_TexTools/FFXIV_TexTools.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
<Product>FFXIV_TexTools</Product>
<Copyright>Copyright © 2024</Copyright>

<ApplicationVersion>3.0.7.2</ApplicationVersion>
<AssemblyVersion>3.0.7.2</AssemblyVersion>
<FileVersion>3.0.7.2</FileVersion>
<ApplicationVersion>3.0.7.3</ApplicationVersion>
<AssemblyVersion>3.0.7.3</AssemblyVersion>
<FileVersion>3.0.7.3</FileVersion>

<LangVersion>9.0</LangVersion>
<UseWPF>true</UseWPF>
Expand Down
5 changes: 5 additions & 0 deletions FFXIV_TexTools/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1149,6 +1149,11 @@ private void Menu_ModList_Click(object sender, RoutedEventArgs e)
/// </summary>
private void Menu_ProblemCheck_Click(object sender, RoutedEventArgs e)
{
if (!MainWindow.GetMainWindow().CheckFileWrite())
{
return;
}

var problemCheckView = new ProblemCheckView {Owner = this};
try
{
Expand Down
2 changes: 1 addition & 1 deletion FFXIV_TexTools/ViewModels/FullModelViewport3DViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ private Dictionary<string, SkeletonData> GetBoneDictionary(XivRace race)
models.Add(kv.Value.TtModel.Source);
}

var boneDict = TTModel.ResolveFullBoneHeirarchy(race, models.ToList());
var boneDict = TTModel.ResolveFullBoneHeirarchy(race, models.ToList(), null, MainWindow.DefaultTransaction);

// Fill in any missing bones that we couldn't otherwise figure out, if possible.
var missingBones = new List<string>();
Expand Down
10 changes: 10 additions & 0 deletions FFXIV_TexTools/ViewModels/MainViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,11 @@ public Visibility ProgressLabelVisible
/// <param name="obj"></param>
private async void EnableAllMods(object obj)
{
if (!MainWindow.GetMainWindow().CheckFileWrite())
{
return;
}

_progressController = await _mainWindow.ShowProgressAsync(UIMessages.EnablingModsTitle, UIMessages.PleaseWaitMessage);

if (FlexibleMessageBox.Show(
Expand Down Expand Up @@ -431,6 +436,11 @@ await Task.Run(async () =>
/// </summary>
private async void DisableAllMods(object obj)
{
if (!MainWindow.GetMainWindow().CheckFileWrite())
{
return;
}

_progressController = await _mainWindow.ShowProgressAsync(UIMessages.DisablingModsTitle, UIMessages.PleaseWaitMessage);

if (FlexibleMessageBox.Show(
Expand Down
1 change: 1 addition & 0 deletions FFXIV_TexTools/Views/Controls/LoadPresetDialog.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ private void LoadButton_Click(object sender, RoutedEventArgs e)
newMtrl.ShaderPack = Material.ShaderPack;
newMtrl.ShaderConstants = Material.ShaderConstants;
newMtrl.ShaderKeys = Material.ShaderKeys;
newMtrl.AdditionalData = Material.AdditionalData;
}

// Carry our Other information through.
Expand Down
2 changes: 1 addition & 1 deletion FFXIV_TexTools/Views/Models/FullModelView.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ private async Task Export(string fullModelName)



TTModel.SaveFullToFile(dbPath, _fmvm.SelectedSkeleton.XivRace, models);
TTModel.SaveFullToFile(dbPath, _fmvm.SelectedSkeleton.XivRace, models, null, MainWindow.DefaultTransaction);

var proc = new Process
{
Expand Down

0 comments on commit 6ac6096

Please sign in to comment.