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

Integrating github/staging through commit ab87ed9

Browse Source
This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Sandbox/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.cpp
-1
View File
@@ -173,7 +173,6 @@ void CComponentEntityObject::AssignEntity(AZ::Entity* entity, bool destroyOld)
entity->FindComponent<AzToolsFramework::Components::TransformComponent>();
if (transformComponent)
{
const AZ::Transform& worldTransform = transformComponent->GetWorldTM();
OnTransformChanged(transformComponent->GetLocalTM(), transformComponent->GetWorldTM());
}
}
Code/Sandbox/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp
+7 -4
View File
@@ -699,11 +699,14 @@ void SandboxIntegrationManager::PopulateEditorGlobalContextMenu(QMenu* menu, con
}
}
action = menu->addAction(QObject::tr("Delete"));
QObject::connect(action, &QAction::triggered, action, [this] { ContextMenu_DeleteSelected(); });
if (selected.size() == 0)
if (!prefabSystemEnabled)
{
action->setDisabled(true);
action = menu->addAction(QObject::tr("Delete"));
QObject::connect(action, &QAction::triggered, action, [this] { ContextMenu_DeleteSelected(); });
if (selected.size() == 0)
{
action->setDisabled(true);
}
}
menu->addSeparator();
Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerListModel.cpp
-2
View File
@@ -963,7 +963,6 @@ bool OutlinerListModel::DropMimeDataAssets(const QMimeData* data, [[maybe_unused
for (const ComponentAssetPair& pair : componentAssetPairs)
{
const AZ::TypeId& componentType = pair.first;
const AZ::Data::AssetId& assetId = pair.second;
componentsToAdd.push_back(componentType);
}
@@ -988,7 +987,6 @@ bool OutlinerListModel::DropMimeDataAssets(const QMimeData* data, [[maybe_unused
}
// Assign asset associated with each created component.
const AZ::Entity::ComponentArrayType& componentsAdded = addComponentsOutcome.GetValue()[targetEntityId].m_componentsAdded;
for (const ComponentAssetPair& pair : componentAssetPairs)
{
const AZ::TypeId& componentType = pair.first;