From 4502a432da45bb817a41939d70886b1bb120d01d Mon Sep 17 00:00:00 2001 From: shiverbrock Date: Tue, 21 Feb 2017 05:26:07 -0500 Subject: [PATCH] [ue4] Made compiling in VS work; defined behavior for GetTrackEntry() (#836) * Added include so that compiling in VS works. * Actually defined behavior for GetTrackEntry() --- .../Source/SpinePlugin/Public/SpineSkeletonAnimationComponent.h | 2 +- .../Source/SpinePlugin/Public/SpineSkeletonComponent.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpineSkeletonAnimationComponent.h b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpineSkeletonAnimationComponent.h index e551e9bd6..899093b23 100644 --- a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpineSkeletonAnimationComponent.h +++ b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpineSkeletonAnimationComponent.h @@ -82,7 +82,7 @@ public: UTrackEntry () { } void SetTrackEntry (spTrackEntry* entry); - spTrackEntry* GetTrackEntry(); + spTrackEntry* GetTrackEntry() { return entry; } UFUNCTION(BlueprintCallable, Category="Components|Spine|TrackEntry") int GetTrackIndex () { return entry ? entry->trackIndex : 0; } diff --git a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpineSkeletonComponent.h b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpineSkeletonComponent.h index 182a02ae1..9356f1ae1 100644 --- a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpineSkeletonComponent.h +++ b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpineSkeletonComponent.h @@ -31,6 +31,7 @@ #pragma once #include "Components/ActorComponent.h" +#include "SpineSkeletonDataAsset.h" #include "spine/spine.h" #include "SpineSkeletonComponent.generated.h"