From 6f486a03a1025c107a947d0c53f270e0325797a0 Mon Sep 17 00:00:00 2001 From: badlogic Date: Fri, 28 Sep 2018 17:54:27 +0200 Subject: [PATCH] [ue4] Reverted re-import fix, lead to memory corruption... --- .../SpineSkeletonAnimationComponent.cpp | 20 ++----------------- 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineSkeletonAnimationComponent.cpp b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineSkeletonAnimationComponent.cpp index 8085930cd..16a18edc7 100644 --- a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineSkeletonAnimationComponent.cpp +++ b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineSkeletonAnimationComponent.cpp @@ -104,27 +104,11 @@ void USpineSkeletonAnimationComponent::InternalTick(float DeltaTime, bool CallDe } void USpineSkeletonAnimationComponent::CheckState () { - bool needsUpdate = lastAtlas != Atlas || lastData != SkeletonData; - - if (!needsUpdate) { - // Are we doing a re-import? Then check if the underlying spine-cpp data - // has changed. - if (lastAtlas && lastAtlas == Atlas && lastData && lastData == SkeletonData) { - spine::Atlas* atlas = Atlas->GetAtlas(false); - if (lastSpineAtlas != atlas) { - needsUpdate = true; - } - if (skeleton && skeleton->getData() != SkeletonData->GetSkeletonData(atlas)) { - needsUpdate = true; - } - } - } - - if (needsUpdate) { + if (lastAtlas != Atlas || lastData != SkeletonData) { DisposeState(); if (Atlas && SkeletonData) { - spine::SkeletonData *data = SkeletonData->GetSkeletonData(Atlas->GetAtlas(false), true); + spine::SkeletonData *data = SkeletonData->GetSkeletonData(Atlas->GetAtlas(false), false); if (data) { skeleton = new (__FILE__, __LINE__) Skeleton(data); AnimationStateData* stateData = SkeletonData->GetAnimationStateData(Atlas->GetAtlas(false));