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

PR feedback

Browse Source 
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
This commit is contained in:
Mikhail Naumov
2022-01-19 15:15:15 -06:00
parent 3506a39759
commit f7c120b4b7
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityContextBus.h
+1 -1
View File
@@ -202,7 +202,7 @@ namespace AzToolsFramework
virtual void OnSaveStreamForGameFailure(AZStd::string_view /*failureString*/) {}
//! Preserve entity order when re-parenting entities
virtual void ForceAddEntitiesToBack(bool /*forceAddToBack*/) {}
virtual void SetForceAddEntitiesToBackFlag(bool /*forceAddToBack*/) {}
};
Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityHelpers.cpp
+2 -2
View File
@@ -1157,7 +1157,7 @@ namespace AzToolsFramework
bool CloneInstantiatedEntities(const EntityIdSet& entitiesToClone, EntityIdSet& clonedEntities)
{
EditorEntityContextNotificationBus::Broadcast(&EditorEntityContextNotification::ForceAddEntitiesToBack, true);
EditorEntityContextNotificationBus::Broadcast(&EditorEntityContextNotification::SetForceAddEntitiesToBackFlag, true);
ScopedUndoBatch undoBatch("Clone Selection");
// Track the mapping of source to cloned entity. This both helps make sure that an entity is not accidentally
@@ -1199,7 +1199,7 @@ namespace AzToolsFramework
// Also replace the selection with the entities that have been cloned.
Internal::UpdateUndoStackAndSelectClonedEntities(allEntityClonesContainer.m_entities, undoBatch);
EditorEntityContextNotificationBus::Broadcast(&EditorEntityContextNotification::ForceAddEntitiesToBack, false);
EditorEntityContextNotificationBus::Broadcast(&EditorEntityContextNotification::SetForceAddEntitiesToBackFlag, false);
for (const AZ::Entity* entity : allEntityClonesContainer.m_entities)
{
Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModel.cpp
+1 -1
View File
@@ -643,7 +643,7 @@ namespace AzToolsFramework
}
}
void EditorEntityModel::ForceAddEntitiesToBack(bool forceAddToBack)
void EditorEntityModel::SetForceAddEntitiesToBackFlag(bool forceAddToBack)
{
m_forceAddToBack = forceAddToBack;
}
Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModel.h
+1 -1
View File
@@ -94,7 +94,7 @@ namespace AzToolsFramework
void OnEntityStreamLoadBegin() override;
void OnEntityStreamLoadSuccess() override;
void OnEntityStreamLoadFailed() override;
void ForceAddEntitiesToBack(bool forceAddToBack) override;
void SetForceAddEntitiesToBackFlag(bool forceAddToBack) override;
////////////////////////////////////////////////
// AzFramework::EntityContextEventBus::Handler
Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
+2 -2
View File
@@ -185,7 +185,7 @@ namespace AzToolsFramework
// Parent the non-container top level entities to the container entity.
// Parenting the top level container entities will be done during the creation of links.
EditorEntityContextNotificationBus::Broadcast(&EditorEntityContextNotification::ForceAddEntitiesToBack, true);
EditorEntityContextNotificationBus::Broadcast(&EditorEntityContextNotification::SetForceAddEntitiesToBackFlag, true);
for (AZ::Entity* topLevelEntity : topLevelEntities)
{
if (!IsInstanceContainerEntity(topLevelEntity->GetId()))
@@ -193,7 +193,7 @@ namespace AzToolsFramework
AZ::TransformBus::Event(topLevelEntity->GetId(), &AZ::TransformBus::Events::SetParent, containerEntityId);
}
}
EditorEntityContextNotificationBus::Broadcast(&EditorEntityContextNotification::ForceAddEntitiesToBack, false);
EditorEntityContextNotificationBus::Broadcast(&EditorEntityContextNotification::SetForceAddEntitiesToBackFlag, false);
// Update the template of the instance since the entities are modified since the template creation.
Prefab::PrefabDom serializedInstance;