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

Integrating github/staging through commit 5f214be

Browse Source
This commit is contained in:
alexpete
2021-04-13 17:18:57 -07:00
parent 2a9dfb7a1d
commit 8469c9ca0a
904 changed files with 9289 additions and 7157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Sandbox/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.cpp
+1 -38
View File
@@ -438,45 +438,8 @@ void CComponentEntityObject::OnEntityIconChanged(const AZ::Data::AssetId& entity
SetupEntityIcon();
}
void CComponentEntityObject::OnParentChanged([[maybe_unused]] AZ::EntityId oldParent, AZ::EntityId newParent)
void CComponentEntityObject::OnParentChanged([[maybe_unused]] AZ::EntityId oldParent, [[maybe_unused]] AZ::EntityId newParent)
{
return;
if (m_parentingReentryGuard) // Ignore if action originated from Sandbox.
{
EditorActionScope parentChange(m_parentingReentryGuard);
CComponentEntityObject* currentParent = static_cast<CComponentEntityObject*>(GetParent());
if (!currentParent && !newParent.IsValid())
{
// No change in parent.
return;
}
if (currentParent && currentParent->GetAssociatedEntityId() == newParent)
{
// No change in parent.
return;
}
DetachThis();
if (newParent.IsValid())
{
CComponentEntityObject* componentEntity = CComponentEntityObject::FindObjectForEntity(newParent);
if (componentEntity)
{
// The action is originating from Sandbox, so ignore the return events.
EditorActionScope transformChange(m_transformReentryGuard);
componentEntity->AttachChild(this);
}
}
InvalidateTM(0);
}
}
void CComponentEntityObject::OnMeshCreated(const AZ::Data::Asset<AZ::Data::AssetData>& asset)