Integrating github/staging through commit ab87ed9

2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -371,7 +371,7 @@ namespace ScriptCanvasEditor

        while (m_ui->typeSelectionFrame->layout()->count() > 0)
        {
-            QLayoutItem* layoutItem = m_ui->typeSelectionFrame->layout()->takeAt(0);
+            m_ui->typeSelectionFrame->layout()->takeAt(0);
        }

        for (ContainerTypeLineEdit* lineEdit : m_containerTypeLineEdit)
@@ -621,4 +621,4 @@ namespace ScriptCanvasEditor
    }
 }

-#include <Editor/View/Dialogs/ContainerWizard/moc_ContainerWizard.cpp>
+#include <Editor/View/Dialogs/ContainerWizard/moc_ContainerWizard.cpp>