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

Merge pull request #6344 from aws-lumberyard-dev/daimini/ReadOnly/TransformResetFix

Browse Source 
Disable invalid operations related to procedural prefabs in the Inspector
This commit is contained in:
Chris Galvan
2021-12-14 09:33:43 -06:00
committed by GitHub
parent d951e1f652 c06b697c6b
commit 8b7cdd45a3
1 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.cpp
+35 -12
View File
@@ -26,7 +26,9 @@
#include <AzToolsFramework/Entity/EditorEntityTransformBus.h>
#include <AzToolsFramework/API/EntityPropertyEditorRequestsBus.h>
#include <AzToolsFramework/API/ToolsApplicationAPI.h>
#include <AzToolsFramework/ContainerEntity/ContainerEntityInterface.h>
#include <AzToolsFramework/Entity/EditorEntityContextBus.h>
#include <AzToolsFramework/Entity/ReadOnly/ReadOnlyEntityInterface.h>
#include <AzToolsFramework/Prefab/PrefabPublicInterface.h>
#include <AzToolsFramework/ToolsComponents/TransformComponentBus.h>
#include <AzToolsFramework/ToolsComponents/TransformComponentSerializer.h>
@@ -35,9 +37,8 @@
#include <AzToolsFramework/ViewportSelection/EditorSelectionUtil.h>
#include <AzToolsFramework/Viewport/ViewportMessages.h>
#include <QMessageBox>
#include <QMenu>
#include <QMessageBox>
namespace AzToolsFramework
{
@@ -662,7 +663,6 @@ namespace AzToolsFramework
return;
}
// Prevent this from parenting to its own child. Check if this entity is in the new parent's hierarchy.
auto potentialParentTransformComponent = GetTransformComponent(parentId);
if (potentialParentTransformComponent && potentialParentTransformComponent->IsEntityInHierarchy(GetEntityId()))
@@ -931,14 +931,27 @@ namespace AzToolsFramework
{
return AZ::Failure(AZStd::string("You cannot set an entity's parent to itself!"));
}
else
// Don't allow the change if it will result in a cycle hierarchy
auto potentialParentTransformComponent = GetTransformComponent(actualValue);
if (potentialParentTransformComponent && potentialParentTransformComponent->IsEntityInHierarchy(GetEntityId()))
{
// Don't allow the change if it will result in a cycle hierarchy
auto potentialParentTransformComponent = GetTransformComponent(actualValue);
if (potentialParentTransformComponent && potentialParentTransformComponent->IsEntityInHierarchy(GetEntityId()))
{
return AZ::Failure(AZStd::string("You cannot set an entity to be a child of one of its own children!"));
}
return AZ::Failure(AZStd::string("You cannot set an entity to be a child of one of its own children!"));
}
// Don't allow read-only entities to be re-parented at all.
// Also don't allow entities to be parented under read-only entities.
if (auto readOnlyEntityPublicInterface = AZ::Interface<ReadOnlyEntityPublicInterface>::Get();
readOnlyEntityPublicInterface->IsReadOnly(GetEntityId()) || readOnlyEntityPublicInterface->IsReadOnly(actualValue))
{
return AZ::Failure(AZStd::string("You cannot set an entity to be a child of a read-only entity!"));
}
// Don't allow entities to be parented under closed containers.
if (auto containerEntityInterface = AZ::Interface<ContainerEntityInterface>::Get();
!containerEntityInterface->IsContainerOpen(actualValue))
{
return AZ::Failure(AZStd::string("You cannot set an entity to be a child of a closed container!"));
}
return AZ::Success();
@@ -1245,6 +1258,15 @@ namespace AzToolsFramework
void TransformComponent::AddContextMenuActions(QMenu* menu)
{
bool parentEntityIsReadOnly = false;
// If the parent entity is marked as read-only, don't allow actions on this transform.
if (auto readOnlyEntityPublicInterface = AZ::Interface<ReadOnlyEntityPublicInterface>::Get();
readOnlyEntityPublicInterface->IsReadOnly(GetEntityId()))
{
parentEntityIsReadOnly = true;
}
if (menu)
{
if (!menu->actions().empty())
@@ -1266,10 +1288,10 @@ namespace AzToolsFramework
AzToolsFramework::ToolsApplicationEvents::Bus::Broadcast(&AzToolsFramework::ToolsApplicationEvents::InvalidatePropertyDisplay, AzToolsFramework::Refresh_Values);
});
resetAction->setEnabled(!m_editorTransform.m_locked);
resetAction->setEnabled(!m_editorTransform.m_locked && !parentEntityIsReadOnly);
QString lockString = m_editorTransform.m_locked ? "Unlock transform values" : "Lock transform values";
menu->addAction(lockString, [this, lockString]()
QAction* lockAction = menu->addAction(lockString, [this, lockString]()
{
{
AzToolsFramework::ScopedUndoBatch undo(lockString.toUtf8().data());
@@ -1278,6 +1300,7 @@ namespace AzToolsFramework
}
AzToolsFramework::ToolsApplicationEvents::Bus::Broadcast(&AzToolsFramework::ToolsApplicationEvents::InvalidatePropertyDisplay, AzToolsFramework::Refresh_AttributesAndValues);
});
lockAction->setEnabled(!parentEntityIsReadOnly);
}
}
}