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

more fixes for Code

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-08-20 14:48:42 -07:00
parent a35464ca08
commit 9245a31196
54 changed files with 97 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceUtilities.cpp
+2 -4
View File
@@ -461,7 +461,7 @@ namespace AzToolsFramework
msgBox.setStandardButtons(QMessageBox::Cancel);
msgBox.setDefaultButton(QMessageBox::Yes);
msgBox.setDetailedText(message.c_str());
const int response = msgBox.exec();
msgBox.exec();
if (msgBox.clickedButton() == moveButton)
{
@@ -2043,7 +2043,7 @@ namespace AzToolsFramework
QAction* confirmSelected = new QAction(detachMenu);
confirmationMessageBox->addAction(confirmSelected);
QObject::connect(reassignToAction, &QAction::triggered, [reassignToAction, confirmationMessageBox, selectedEntity, ancestors, currentAncestorIndex]() mutable
QObject::connect(reassignToAction, &QAction::triggered, [confirmationMessageBox, ancestors, currentAncestorIndex]() mutable
{
if (confirmationMessageBox->exec() == QDialog::Accepted)
{
@@ -4200,8 +4200,6 @@ namespace AzToolsFramework
if (canPush)
{
AZ::Data::AssetId targetSliceAssetId = sliceAncestryToPushTo.at(0).m_sliceAddress.GetReference()->GetSliceAsset().GetId();
//remember we're trying to push to this root, so we don't try to push to any others
size_t ancestrySize = sliceAncestryToPushTo.size();
rootAncestorPushList.push_back(sliceAncestryToPushTo[ancestrySize-1].m_sliceAddress.GetReference()->GetSliceAsset().GetId());