LegacyConsole/PCK-Studio
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/PCK-Studio.git synced 2026-05-29 10:24:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

ANIM Editor - use '|=' instead when applying template anim

Browse Source
This commit is contained in:
miku-666
2023-05-25 14:21:53 +02:00
parent be69240fea
commit c86cec1a1e
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PCK-Studio/Forms/Editor/ANIMEditor.cs
View File

@@ -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);
}

3
PCK-Studio/Forms/Utilities/AppBehaviorSettingsForm.resx
View File

@@ -120,7 +120,4 @@
<metadata name="SettingToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="SettingToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>

1
PCK-Studio/PckStudio.csproj
View File

@@ -589,6 +589,7 @@
</EmbeddedResource>
<EmbeddedResource Include="Forms\Utilities\AppBehaviorSettingsForm.resx">
<DependentUpon>AppBehaviorSettingsForm.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="MainForm.ja.resx">
<DependentUpon>MainForm.cs</DependentUpon>