birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin' into MultiplayerComponents

Browse Source
This commit is contained in:
karlberg
2021-05-05 20:07:49 -07:00
parent a1fe8fe419 724add6365
commit 751d13dd7b
773 changed files with 5555 additions and 37483 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Actor/ActorBuilder.cpp
-1
View File
@@ -43,7 +43,6 @@
#include <AzCore/std/smart_ptr/make_shared.h>
#include <AzCore/Interface/Interface.h>
#include <AzFramework/Application/Application.h>
#include <AzFramework/API/AtomActiveInterface.h>
#include <AzToolsFramework/Debug/TraceContext.h>
Gems/EMotionFX/Code/Source/Integration/Components/ActorComponent.h
+1 -6
View File
@@ -22,7 +22,6 @@
#include <AzFramework/Physics/RagdollPhysicsBus.h>
#include <AzFramework/Physics/CharacterPhysicsDataBus.h>
#include <AzFramework/Physics/Common/PhysicsEvents.h>
#include <AzFramework/API/AtomActiveInterface.h>
#include <Integration/Assets/ActorAsset.h>
#include <Integration/ActorComponentBus.h>
@@ -130,11 +129,7 @@ namespace EMotionFX
provided.push_back(AZ_CRC("EMotionFXActorService", 0xd6e8f48d));
provided.push_back(AZ_CRC("MeshService", 0x71d8a455));
provided.push_back(AZ_CRC("CharacterPhysicsDataService", 0x34757927));
if (AZ::Interface<AzFramework::AtomActiveInterface>::Get())
{
provided.push_back(AZ_CRC("MaterialReceiverService", 0x0d1a6a74));
}
provided.push_back(AZ_CRC("MaterialReceiverService", 0x0d1a6a74));
}
static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorActorComponent.cpp
+1 -1
View File
@@ -815,7 +815,7 @@ namespace EMotionFX
bool EditorActorComponent::IsAtomDisabled() const
{
return !AZ::Interface<AzFramework::AtomActiveInterface>::Get();
return false;
}
void EditorActorComponent::OnActorReady(Actor* actor)
Gems/EMotionFX/Code/Tests/UI/LODSkinnedMeshTests.cpp
-1
View File
@@ -77,7 +77,6 @@ namespace EMotionFX
m_app.RegisterComponentDescriptor(AzFramework::TransformComponent::CreateDescriptor());
m_envPrev = gEnv;
m_env.p3DEngine = nullptr;
m_env.pRenderer = &m_data.m_renderer;
m_env.pSystem = &m_data.m_system;
gEnv = &m_env;