UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.1' of https://github.com/esotericsoftware/spine-runtimes into 4.1

Browse Source
This commit is contained in:
Mario Zechner 2022-07-18 14:03:42 +02:00
commit 2ddcf751e3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-unity/Assets/Spine/Editor/spine-unity/Editor/Asset Types/SkeletonDataAssetInspector.cs
View File

@ -193,7 +193,7 @@ namespace Spine.Unity.Editor {
} }
if (changeCheck.changed) { if (changeCheck.changed) {
if (requiresReload || serializedObject.ApplyModifiedProperties()) { if (serializedObject.ApplyModifiedProperties() || requiresReload) {
this.Clear(); this.Clear();
this.InitializeEditor(); this.InitializeEditor();

2
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/TK2D/SpriteCollectionAttachmentLoader.cs
View File

@ -105,7 +105,7 @@ namespace Spine.Unity.TK2D {
page.rendererObject = material; page.rendererObject = material;
region.page = page; region.page = page;
region.u = u; region.u = u;
region.u = v; region.v = v;
region.u2 = u2; region.u2 = u2;
region.v2 = v2; region.v2 = v2;
region.rotate = regionRotated; region.rotate = regionRotated;