Skip to content

Commit

Permalink
2.4.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Meowmaritus committed Sep 26, 2020
1 parent 9ef0cb5 commit 3b00b5e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion DSAnimStudio/Main.cs
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public static Vector3 RandSignedVector3()

public static string Directory = null;

public const string VERSION = "Version 2.4.2";
public const string VERSION = "Version 2.4.3";

public static bool FIXED_TIME_STEP = false;

Expand Down
10 changes: 6 additions & 4 deletions DSAnimStudio/TaeEditor/TaeEditAnimPropertiesForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,6 @@ private void MiniHeaderLoadValuesToGUI(TAE.Animation.AnimMiniHeader miniHeader)
}
else if (miniHeader is TAE.Animation.AnimMiniHeader.ImportOtherAnim asImportOtherAnim)
{
groupBoxMHStandard.Text = "Mini-Header Type: Import Other Animation";

textBoxMHDuplicateSourceAnimID.Text = HKXNameFromCompositeID(asImportOtherAnim.ImportFromAnimID);
textBoxMHDuplicateUnk.Text = asImportOtherAnim.Unknown.ToString();
}
Expand Down Expand Up @@ -124,7 +122,7 @@ private TAE.Animation.AnimMiniHeader MiniHeaderSaveValuesFromGUI()
{
var asImportOtherAnim = new TAE.Animation.AnimMiniHeader.ImportOtherAnim();

if (string.IsNullOrWhiteSpace(textBoxMHStandardImportHKXFrom.Text))
if (string.IsNullOrWhiteSpace(textBoxMHDuplicateSourceAnimID.Text))
{
asImportOtherAnim.ImportFromAnimID = -1;
}
Expand Down Expand Up @@ -179,7 +177,7 @@ private void MiniHeaderPrepareGUI(TAE.Animation.MiniHeaderType miniHeaderType)
groupBoxMHDuplicate.Enabled = false;

textBoxMHDuplicateSourceAnimID.Text = "";
textBoxMHDuplicateUnk.Text = "";
textBoxMHDuplicateUnk.Text = "0";

//radioButtonMHStandard.Checked = true;
//radioButtonMHImportOtherAnimation.Checked = false;
Expand Down Expand Up @@ -356,6 +354,10 @@ private void buttonSaveChanges_Click(object sender, EventArgs e)
}
else
{
AnimRef.ID = originalID;
AnimRef.MiniHeader = originalMiniHeader;
AnimRef.AnimFileName = originalDisplayName;

MessageBox.Show("Changes were not saved due to formatting errors.",
"Changes Not Saved", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
Expand Down

0 comments on commit 3b00b5e

Please sign in to comment.