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

[unity] Fixed threaded system not handling null skeleton. Closes #2954.

Browse Source
This commit is contained in:
Harald Csaszar 2025-10-17 17:43:01 +02:00
parent 59c90592c3
commit 2a73be09b7
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spine-unity/Assets/Spine/Runtime/spine-unity/Threading/SkeletonUpdateSystem.cs
View File

@ -106,10 +106,18 @@ namespace Spine.Unity {
} }
public static int SkeletonSortComparer (ISkeletonRenderer first, ISkeletonRenderer second) { public static int SkeletonSortComparer (ISkeletonRenderer first, ISkeletonRenderer second) {
return first.Skeleton.Data.GetHashCode() - second.Skeleton.Data.GetHashCode(); Skeleton firstSkeleton = first.Skeleton;
Skeleton secondSkeleton = second.Skeleton;
if (firstSkeleton == null) return secondSkeleton == null ? 0 : -1;
else if (secondSkeleton == null) return 1;
else return firstSkeleton.Data.GetHashCode() - secondSkeleton.Data.GetHashCode();
} }
public static int SkeletonSortComparer (SkeletonAnimationBase first, SkeletonAnimationBase second) { public static int SkeletonSortComparer (SkeletonAnimationBase first, SkeletonAnimationBase second) {
return first.Skeleton.Data.GetHashCode() - second.Skeleton.Data.GetHashCode(); Skeleton firstSkeleton = first.Skeleton;
Skeleton secondSkeleton = second.Skeleton;
if (firstSkeleton == null) return secondSkeleton == null ? 0 : -1;
else if (secondSkeleton == null) return 1;
else return firstSkeleton.Data.GetHashCode() - secondSkeleton.Data.GetHashCode();
} }
public static readonly Comparison<ISkeletonRenderer> SkeletonRendererComparer = SkeletonSortComparer; public static readonly Comparison<ISkeletonRenderer> SkeletonRendererComparer = SkeletonSortComparer;
public static readonly Comparison<SkeletonAnimationBase> SkeletonAnimationComparer = SkeletonSortComparer; public static readonly Comparison<SkeletonAnimationBase> SkeletonAnimationComparer = SkeletonSortComparer;