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

Do not delete the actor instance if it's belong to an entity. (#4624)

Browse Source 
Signed-off-by: rhhong <rhhong@amazon.com>
This commit is contained in:
Roman
2021-10-12 08:53:30 -07:00
committed by GitHub
parent ccb686b0fc
commit 129d249cb4
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportRenderer.cpp
+4
View File
@@ -92,6 +92,7 @@ namespace EMStudio
m_postProcessEntity->CreateComponent(AZ::Render::PostFxLayerComponentTypeId);
m_postProcessEntity->CreateComponent(AZ::Render::ExposureControlComponentTypeId);
m_postProcessEntity->CreateComponent(azrtti_typeid<AzFramework::TransformComponent>());
m_postProcessEntity->Init();
m_postProcessEntity->Activate();
// Init directional light processor
@@ -112,6 +113,7 @@ namespace EMStudio
m_iblEntity->CreateComponent(AZ::Render::ImageBasedLightComponentTypeId);
m_iblEntity->CreateComponent(azrtti_typeid<AzFramework::TransformComponent>());
m_iblEntity->Init();
m_iblEntity->Activate();
// Load light preset
@@ -134,6 +136,7 @@ namespace EMStudio
gridComponent->SetConfiguration(gridConfig);
m_gridEntity->CreateComponent(azrtti_typeid<AzFramework::TransformComponent>());
m_gridEntity->Init();
m_gridEntity->Activate();
Reinit();
@@ -251,6 +254,7 @@ namespace EMStudio
actorEntity->CreateComponent(azrtti_typeid<EMotionFX::Integration::ActorComponent>());
actorEntity->CreateComponent(AZ::Render::MaterialComponentTypeId);
actorEntity->CreateComponent(azrtti_typeid<AzFramework::TransformComponent>());
actorEntity->Init();
actorEntity->Activate();
EMotionFX::Integration::ActorComponent* actorComponent = actorEntity->FindComponent<EMotionFX::Integration::ActorComponent>();
Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ActorCommands.cpp
+5
View File
@@ -825,6 +825,11 @@ namespace CommandSystem
{
continue;
}
// Ignore actor instances owned by entity
if (actorInstance->GetEntity())
{
continue;
}
// generate command to remove the actor instance
const AZStd::string command = AZStd::string::format("RemoveActorInstance -actorInstanceID %i", actorInstance->GetID());