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 '3.8' into 3.9-beta

Browse Source
This commit is contained in:
Harald Csaszar 2020-01-21 13:44:43 +01:00
commit f4408185f7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-unity/Assets/Spine/Runtime/spine-unity/Components/Following/BoneFollowerGraphic.cs
View File

@ -131,7 +131,7 @@ namespace Spine.Unity {
var canvas = skeletonGraphic.canvas; var canvas = skeletonGraphic.canvas;
if (canvas == null) canvas = skeletonGraphic.GetComponentInParent<Canvas>(); if (canvas == null) canvas = skeletonGraphic.GetComponentInParent<Canvas>();
float scale = canvas.referencePixelsPerUnit; float scale = canvas != null ? canvas.referencePixelsPerUnit : 100.0f;
if (skeletonTransformIsParent) { if (skeletonTransformIsParent) {
// Recommended setup: Use local transform properties if Spine GameObject is the immediate parent // Recommended setup: Use local transform properties if Spine GameObject is the immediate parent