Merge branch '3.8' into 3.9-beta

This commit is contained in:
Harald Csaszar 2020-01-21 13:44:43 +01:00
commit f4408185f7

View File

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