diff --git a/PCK-Studio/Forms/Editor/ANIMEditor.cs b/PCK-Studio/Forms/Editor/ANIMEditor.cs index 4cddf43c..e54ffd5f 100644 --- a/PCK-Studio/Forms/Editor/ANIMEditor.cs +++ b/PCK-Studio/Forms/Editor/ANIMEditor.cs @@ -341,7 +341,7 @@ namespace PckStudio.Forms.Editor var templateANIM = new SkinANIM(Templates[diag.SelectedItem]); DialogResult prompt = MessageBox.Show(this, "Would you like to add this preset's effects to your current ANIM? Otherwise all of your effects will be cleared. Either choice can be undone by pressing \"Restore ANIM\".", "", MessageBoxButtons.YesNo); if (prompt == DialogResult.Yes) - templateANIM = ruleset.Value | templateANIM; + templateANIM |= ruleset.Value; ruleset.ApplyAnim(templateANIM); } diff --git a/PCK-Studio/Forms/Utilities/AppBehaviorSettingsForm.resx b/PCK-Studio/Forms/Utilities/AppBehaviorSettingsForm.resx index ab1b49e0..9b5d83ba 100644 --- a/PCK-Studio/Forms/Utilities/AppBehaviorSettingsForm.resx +++ b/PCK-Studio/Forms/Utilities/AppBehaviorSettingsForm.resx @@ -120,7 +120,4 @@ 17, 17 - - 17, 17 - \ No newline at end of file diff --git a/PCK-Studio/PckStudio.csproj b/PCK-Studio/PckStudio.csproj index 1cb9a8d4..dc36ec64 100644 --- a/PCK-Studio/PckStudio.csproj +++ b/PCK-Studio/PckStudio.csproj @@ -589,6 +589,7 @@ AppBehaviorSettingsForm.cs + Designer MainForm.cs