From de95aa4d217c2140eaadbd0e7b9d890cdd412e67 Mon Sep 17 00:00:00 2001 From: Ariel Lorenzo-Luaces Date: Fri, 9 Feb 2018 15:12:52 -0800 Subject: [PATCH] Added includes to fix errors when making non-unity builds --- .../Animation/AnimNode_BlendFaceFXAnimation.cpp | 13 +++++++++++++ Source/FaceFX/Private/Animation/FaceFXComponent.cpp | 1 + .../FaceFX/Private/Matinee/FaceFXMatineeControl.cpp | 1 + .../Private/Sequencer/FaceFXAnimationSection.cpp | 1 + Source/FaceFX/Public/FaceFXContext.h | 2 ++ .../Classes/Factories/FaceFXAnimFactory.h | 1 + Source/FaceFXEditor/Include/Slate/FaceFXStyle.cpp | 1 + .../Private/Factories/FaceFXActorFactory.cpp | 1 + 8 files changed, 21 insertions(+) diff --git a/Source/FaceFX/Private/Animation/AnimNode_BlendFaceFXAnimation.cpp b/Source/FaceFX/Private/Animation/AnimNode_BlendFaceFXAnimation.cpp index 0a7305a..7508725 100644 --- a/Source/FaceFX/Private/Animation/AnimNode_BlendFaceFXAnimation.cpp +++ b/Source/FaceFX/Private/Animation/AnimNode_BlendFaceFXAnimation.cpp @@ -176,6 +176,19 @@ void FAnimNode_BlendFaceFXAnimation::Evaluate_AnyThread(FPoseContext& Output) #endif } +bool ContainsNaN(const TArray & BoneTransforms) +{ + for (int32 i = 0; i < BoneTransforms.Num(); ++i) + { + if (BoneTransforms[i].Transform.ContainsNaN()) + { + return true; + } + } + + return false; +} + void FAnimNode_BlendFaceFXAnimation::EvaluateComponentSpace_AnyThread(FComponentSpacePoseContext& Output) { SCOPE_CYCLE_COUNTER(STAT_FaceFXBlend); diff --git a/Source/FaceFX/Private/Animation/FaceFXComponent.cpp b/Source/FaceFX/Private/Animation/FaceFXComponent.cpp index e64c334..c2bd72c 100644 --- a/Source/FaceFX/Private/Animation/FaceFXComponent.cpp +++ b/Source/FaceFX/Private/Animation/FaceFXComponent.cpp @@ -21,6 +21,7 @@ #include "Animation/FaceFXComponent.h" #include "FaceFX.h" #include "Engine/StreamableManager.h" +#include "Components/SkeletalMeshComponent.h" UFaceFXComponent::UFaceFXComponent(const FObjectInitializer& ObjectInitializer) : Super(ObjectInitializer), NumAsyncLoadRequestsPending(0) { diff --git a/Source/FaceFX/Private/Matinee/FaceFXMatineeControl.cpp b/Source/FaceFX/Private/Matinee/FaceFXMatineeControl.cpp index c9fd7bc..db218bd 100644 --- a/Source/FaceFX/Private/Matinee/FaceFXMatineeControl.cpp +++ b/Source/FaceFX/Private/Matinee/FaceFXMatineeControl.cpp @@ -30,6 +30,7 @@ #include "Matinee/MatineeActor.h" #include "InterpolationHitProxy.h" #include "CanvasTypes.h" +#include "Components/SkeletalMeshComponent.h" #define LOCTEXT_NAMESPACE "FaceFX" diff --git a/Source/FaceFX/Private/Sequencer/FaceFXAnimationSection.cpp b/Source/FaceFX/Private/Sequencer/FaceFXAnimationSection.cpp index 66abe70..8a2cbae 100644 --- a/Source/FaceFX/Private/Sequencer/FaceFXAnimationSection.cpp +++ b/Source/FaceFX/Private/Sequencer/FaceFXAnimationSection.cpp @@ -26,6 +26,7 @@ SOFTWARE. #include "MovieSceneSequence.h" #include "MovieScenePossessable.h" +#include "GameFramework/Actor.h" #define LOCTEXT_NAMESPACE "FaceFX" diff --git a/Source/FaceFX/Public/FaceFXContext.h b/Source/FaceFX/Public/FaceFXContext.h index aa33982..211e593 100644 --- a/Source/FaceFX/Public/FaceFXContext.h +++ b/Source/FaceFX/Public/FaceFXContext.h @@ -20,6 +20,8 @@ #pragma once +#include "HAL/UnrealMemory.h" + struct FFaceFXContext { /** diff --git a/Source/FaceFXEditor/Classes/Factories/FaceFXAnimFactory.h b/Source/FaceFXEditor/Classes/Factories/FaceFXAnimFactory.h index b42cca1..be7303f 100644 --- a/Source/FaceFXEditor/Classes/Factories/FaceFXAnimFactory.h +++ b/Source/FaceFXEditor/Classes/Factories/FaceFXAnimFactory.h @@ -23,6 +23,7 @@ #include "IAssetTypeActions.h" #include "Include/Slate/FaceFXStyle.h" #include "Factories/Factory.h" +#include "FeedbackContext.h" #include "FaceFXAnimFactory.generated.h" UCLASS(hidecategories=Object) diff --git a/Source/FaceFXEditor/Include/Slate/FaceFXStyle.cpp b/Source/FaceFXEditor/Include/Slate/FaceFXStyle.cpp index 8df411b..a154a63 100644 --- a/Source/FaceFXEditor/Include/Slate/FaceFXStyle.cpp +++ b/Source/FaceFXEditor/Include/Slate/FaceFXStyle.cpp @@ -21,6 +21,7 @@ #include "FaceFXStyle.h" #include "FaceFXConfig.h" #include "FaceFXEditor.h" +#include "SlateBrush.h" #include "SlateStyle.h" #include "ClassIconFinder.h" #include "SlateStyleRegistry.h" diff --git a/Source/FaceFXEditor/Private/Factories/FaceFXActorFactory.cpp b/Source/FaceFXEditor/Private/Factories/FaceFXActorFactory.cpp index 6297b06..f49eaaf 100644 --- a/Source/FaceFXEditor/Private/Factories/FaceFXActorFactory.cpp +++ b/Source/FaceFXEditor/Private/Factories/FaceFXActorFactory.cpp @@ -33,6 +33,7 @@ #include "ISourceControlModule.h" #include "Editor.h" #include "FeedbackContext.h" +#include "MessageDialog.h" #define LOCTEXT_NAMESPACE "FaceFX"