UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-20 17:26:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.0' into 4.1-beta, fixed conflict.

Browse Source
This commit is contained in:
Harald Csaszar 2021-11-15 16:20:06 +01:00
commit da6016cf07
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-unity/Assets/Spine Examples/Other Examples/Instantiate from Script.unity
View File

@ -276,7 +276,7 @@ GameObject:
- component: {fileID: 651278530}
- component: {fileID: 651278529}
m_Layer: 0
m_Name: 2 DataAssets from Exports
m_Name: 2 RuntimeLoadFromExports
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0

1
spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonGraphic.cs
View File

@ -411,6 +411,7 @@ namespace Spine.Unity {
}
public bool MatchRectTransformWithBounds () {
if (!wasUpdatedAfterInit) Update(0);
UpdateMesh();
if (!this.allowMultipleCanvasRenderers)