diff --git a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SSpineWidget.cpp b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SSpineWidget.cpp index e395ce152..6dcdffd53 100644 --- a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SSpineWidget.cpp +++ b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SSpineWidget.cpp @@ -210,7 +210,7 @@ void SSpineWidget::Flush(int32 LayerId, FSlateWindowElementList& OutDrawElements setVertex(&vertexData[i], Vertices[i].X, Vertices[i].Y, Uvs[i].X, Uvs[i].Y, Colors[i], offset); } - FSlateBrush brush; + /*FSlateBrush brush; brush.SetResourceObject(Material); brush = widget->Brush; @@ -218,7 +218,7 @@ void SSpineWidget::Flush(int32 LayerId, FSlateWindowElementList& OutDrawElements if (shaderResource) { FSlateResourceHandle resourceHandle = FSlateApplication::Get().GetRenderer()->GetResourceHandle(brush); FSlateDrawElement::MakeCustomVerts(OutDrawElements, LayerId, resourceHandle, renderData.VertexData, renderData.IndexData, nullptr, 0, 0); - } + }*/ Vertices.SetNum(0); Indices.SetNum(0); diff --git a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineSkeletonAnimationComponent.cpp b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineSkeletonAnimationComponent.cpp index 16a18edc7..d0e1847a2 100644 --- a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineSkeletonAnimationComponent.cpp +++ b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineSkeletonAnimationComponent.cpp @@ -34,8 +34,8 @@ using namespace spine; -void UTrackEntry::SetTrackEntry(TrackEntry* entry) { - this->entry = entry; +void UTrackEntry::SetTrackEntry(TrackEntry* trackEntry) { + this->entry = trackEntry; if (entry) entry->setRendererObject((void*)this); } diff --git a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineSkeletonDataAsset.cpp b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineSkeletonDataAsset.cpp index 3dcdfbafa..ec8a4dae3 100644 --- a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineSkeletonDataAsset.cpp +++ b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineSkeletonDataAsset.cpp @@ -136,8 +136,8 @@ SkeletonData* USpineSkeletonDataAsset::GetSkeletonData (Atlas* Atlas, bool Force AnimationStateData* USpineSkeletonDataAsset::GetAnimationStateData(Atlas* atlas) { if (!animationStateData) { - SkeletonData* skeletonData = GetSkeletonData(atlas, false); - animationStateData = new (__FILE__, __LINE__) AnimationStateData(skeletonData); + SkeletonData* data = GetSkeletonData(atlas, false); + animationStateData = new (__FILE__, __LINE__) AnimationStateData(data); } for (auto& data : MixData) { if (!data.From.IsEmpty() && !data.To.IsEmpty()) { diff --git a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpineSkeletonAnimationComponent.h b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpineSkeletonAnimationComponent.h index f4a7da2c8..c02d121bd 100644 --- a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpineSkeletonAnimationComponent.h +++ b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpineSkeletonAnimationComponent.h @@ -81,7 +81,7 @@ public: UTrackEntry () { } - void SetTrackEntry (spine::TrackEntry* entry); + void SetTrackEntry (spine::TrackEntry* trackEntry); spine::TrackEntry* GetTrackEntry() { return entry; } UFUNCTION(BlueprintCallable, Category="Components|Spine|TrackEntry") diff --git a/spine-ue4/SpineUE4.uproject b/spine-ue4/SpineUE4.uproject index df2d5b601..85dca7bbd 100644 --- a/spine-ue4/SpineUE4.uproject +++ b/spine-ue4/SpineUE4.uproject @@ -1,6 +1,6 @@ { "FileVersion": 3, - "EngineAssociation": "4.20", + "EngineAssociation": "4.21", "Category": "", "Description": "", "Modules": [