Integrating latest 47acbe8
This commit is contained in:
@@ -25,8 +25,6 @@
|
||||
#include <EMotionFX/Source/BlendTreeParameterNode.h>
|
||||
#include <EMotionFX/Source/EMotionFXManager.h>
|
||||
#include <EMotionFX/Source/Mesh.h>
|
||||
#include <EMotionFX/Source/MeshBuilder.h>
|
||||
#include <EMotionFX/Source/MeshBuilderVertexAttributeLayers.h>
|
||||
#include <EMotionFX/Source/MorphSetup.h>
|
||||
#include <EMotionFX/Source/MorphTargetStandard.h>
|
||||
#include <EMotionFX/Source/MotionSet.h>
|
||||
@@ -81,7 +79,6 @@ namespace EMotionFX
|
||||
ScaleMesh(morphMesh);
|
||||
MorphTargetStandard* morphTarget = MorphTargetStandard::Create(
|
||||
/*captureTransforms=*/ false,
|
||||
/*captureMeshDeforms=*/ true,
|
||||
m_actor.get(),
|
||||
morphActor.get(),
|
||||
"morphTarget"
|
||||
@@ -165,7 +162,7 @@ namespace EMotionFX
|
||||
const float m_scaleFactor = 10.0f;
|
||||
};
|
||||
|
||||
TEST_F(MorphTargetRuntimeFixture, TestMorphTargetMeshRuntime)
|
||||
TEST_F(MorphTargetRuntimeFixture, DISABLED_TestMorphTargetMeshRuntime)
|
||||
{
|
||||
const float fps = 30.0f;
|
||||
const float updateInterval = 1.0f / fps;
|
||||
|
||||
Reference in New Issue
Block a user