[ue4] Updated sample project to require UE 4.21+. Fixed shadowing local variables. See #1250.

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);

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);
 }
 

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()) {

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")

spine-ue4/SpineUE4.uproject

@@ -1,6 +1,6 @@
 {
 	"FileVersion": 3,
-	"EngineAssociation": "4.20",
+	"EngineAssociation": "4.21",
 	"Category": "",
 	"Description": "",
 	"Modules": [