Skip to content

Commit

Permalink
Update v3.0.5.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Lunaretic committed Jul 11, 2024
2 parents 5c62802 + f8fbff4 commit f5e9d20
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 17 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.5.2</ApplicationVersion>
<AssemblyVersion>3.0.5.2</AssemblyVersion>
<FileVersion>3.0.5.2</FileVersion>
<ApplicationVersion>3.0.5.3</ApplicationVersion>
<AssemblyVersion>3.0.5.3</AssemblyVersion>
<FileVersion>3.0.5.3</FileVersion>

<LangVersion>9.0</LangVersion>
<UseWPF>true</UseWPF>
Expand Down
9 changes: 9 additions & 0 deletions FFXIV_TexTools/Helpers/ModpackUpgraderWrapper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@ public static async Task UpgradeModpackPrompted(bool includePartials = true)

var data = await xivModdingFramework.Mods.ModpackUpgrader.UpgradeModpack(path, includePartials);

if(!data.AnyChanges)
{
FlexibleMessageBox.Show(ViewHelpers.GetWin32Window(MainWindow.GetMainWindow()),
"The upgrader found nothing to upgrade in the modpack.\n\nThis typically means the mod either does not need to be upgraded, must be manually upgraded, or was already upgraded, possibly by another tool (Ex. Penumbra).",
"No Upgrade Needed",
MessageBoxButtons.OK, MessageBoxIcon.Information);
return;
}

var ext = Path.GetExtension(path);

var name = Path.GetFileNameWithoutExtension(path);
Expand Down
13 changes: 0 additions & 13 deletions FFXIV_TexTools/Views/FileControls/MaterialFileControl.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -518,19 +518,6 @@ private async void ShaderComboBox_SelectionChanged(object sender, SelectionChang
OnPropertyChanged(nameof(ColorsetEnabled));


// Create or purge colorset as necessary.
if (ShaderPack != EShaderPack.Character)
{
Material.ColorSetData = new List<Half>();
Material.ColorSetDyeData = new byte[0];
} else
{
var length = 1024;
var dyeLength = 128;
Material.ColorSetData = new List<Half>(new Half[length]);
Material.ColorSetDyeData = new byte[dyeLength];
}

// Reset shader vars.
Material.ShaderKeys = new List<ShaderKey>();
Material.ShaderConstants = new List<ShaderConstant>();
Expand Down

0 comments on commit f5e9d20

Please sign in to comment.