Merged stabilization/2106 to development; Resolved merge conflicts

Signed-off-by: Chris Galvan <chgalvan@amazon.com>

Code/Editor/Plugins/ComponentEntityEditorPlugin/CMakeLists.txt

@@ -27,6 +27,7 @@ ly_add_target(
     BUILD_DEPENDENCIES
         PRIVATE
             3rdParty::Qt::Core
+            3rdParty::Qt::Widgets
             AZ::AzCore
             AZ::AzToolsFramework
             Legacy::CryCommon

Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerDisplayOptionsMenu.cpp

@@ -66,3 +66,5 @@ namespace EntityOutliner
         emit OnOptionToggled(DisplayOption::AutoExpand, checked);
     }
 }
+
+#include <UI/Outliner/moc_OutlinerDisplayOptionsMenu.cpp>

Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerSortFilterProxyModel.cpp

@@ -32,7 +32,24 @@ bool OutlinerSortFilterProxyModel::filterAcceptsRow(int sourceRow, const QModelI
 
 bool OutlinerSortFilterProxyModel::lessThan(const QModelIndex& leftIndex, const QModelIndex& rightIndex) const
 {
-    return sourceModel()->data(leftIndex).toString() < sourceModel()->data(rightIndex).toString();
+    if (leftIndex.isValid() && rightIndex.isValid())
+    {
+        QVariant leftData = sourceModel()->data(leftIndex);
+        QVariant rightData = sourceModel()->data(rightIndex);
+
+        // make sure to compare the correct data types for sorting the current column
+        AZ_Assert(leftData.type() == rightData.type(), "OutlinerSortFilterProxyModel::lessThan types do not agree!");
+        if (static_cast<QMetaType::Type>(leftData.type()) == QMetaType::QString)
+        {
+            return leftData.toString() < rightData.toString();
+        }
+        else if (static_cast<QMetaType::Type>(leftData.type()) == QMetaType::ULongLong)
+        {
+            return leftData.toULongLong() < rightData.toULongLong();
+        }
+        AZ_Error("Editor", false, "Error! Unhandled type \"%s\" in OutlinerSortFilterProxyModel::lessThan", leftData.typeName());
+    }
+    return false;
 }
 
 void OutlinerSortFilterProxyModel::sort(int /*column*/, Qt::SortOrder /*order*/)

Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerWidget.cpp

@@ -269,10 +269,12 @@ OutlinerWidget::OutlinerWidget(QWidget* pParent, Qt::WindowFlags flags)
     AzToolsFramework::ComponentModeFramework::EditorComponentModeNotificationBus::Handler::BusConnect(
             AzToolsFramework::GetEntityContextId());
     AzToolsFramework::EditorEntityInfoNotificationBus::Handler::BusConnect();
+    AzToolsFramework::EditorWindowUIRequestBus::Handler::BusConnect();
 }
 
 OutlinerWidget::~OutlinerWidget()
 {
+    AzToolsFramework::EditorWindowUIRequestBus::Handler::BusDisconnect();
     AzToolsFramework::ComponentModeFramework::EditorComponentModeNotificationBus::Handler::BusDisconnect();
     AzToolsFramework::EditorEntityInfoNotificationBus::Handler::BusDisconnect();
     AzToolsFramework::EditorPickModeNotificationBus::Handler::BusDisconnect();
@@ -1321,16 +1323,25 @@ static void SetEntityOutlinerState(Ui::OutlinerWidgetUI* entityOutlinerUi, const
     AzQtComponents::SetWidgetInteractEnabled(entityOutlinerUi->m_searchWidget, on);
 }
 
+void OutlinerWidget::EnableUi(bool enable)
+{
+    SetEntityOutlinerState(m_gui, enable);
+    setEnabled(enable);
+}
+
+void OutlinerWidget::SetEditorUiEnabled(bool enable)
+{
+    EnableUi(enable);
+}
+
 void OutlinerWidget::EnteredComponentMode([[maybe_unused]] const AZStd::vector<AZ::Uuid>& componentModeTypes)
 {
-    SetEntityOutlinerState(m_gui, false);
-    setEnabled(false);
+    EnableUi(false);
 }
 
 void OutlinerWidget::LeftComponentMode([[maybe_unused]] const AZStd::vector<AZ::Uuid>& componentModeTypes)
 {
-    setEnabled(true);
-    SetEntityOutlinerState(m_gui, true);
+    EnableUi(true);
 }
 
 void OutlinerWidget::OnSliceInstantiated(const AZ::Data::AssetId& /*sliceAssetId*/, AZ::SliceComponent::SliceInstanceAddress& sliceAddress, const AzFramework::SliceInstantiationTicket& /*ticket*/)

Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerWidget.hxx

@@ -13,6 +13,7 @@
 
 #include <AzCore/Memory/SystemAllocator.h>
 #include <AzCore/base.h>
+#include <AzToolsFramework/API/EditorWindowRequestBus.h>
 #include <AzToolsFramework/API/ToolsApplicationAPI.h>
 #include <AzToolsFramework/ComponentMode/EditorComponentModeBus.h>
 #include <AzToolsFramework/Entity/EditorEntityInfoBus.h>
@@ -57,6 +58,7 @@ class OutlinerWidget
     , private AzToolsFramework::SliceEditorEntityOwnershipServiceNotificationBus::Handler
     , private AzToolsFramework::EditorEntityInfoNotificationBus::Handler
     , private AzToolsFramework::ComponentModeFramework::EditorComponentModeNotificationBus::Handler
+    , private AzToolsFramework::EditorWindowUIRequestBus::Handler
 {
     Q_OBJECT;
 public:
@@ -106,6 +108,9 @@ private:
     void EnteredComponentMode(const AZStd::vector<AZ::Uuid>& componentModeTypes) override;
     void LeftComponentMode(const AZStd::vector<AZ::Uuid>& componentModeTypes) override;
 
+    // EditorWindowUIRequestBus overrides
+    void SetEditorUiEnabled(bool enable) override;
+
     // Build a selection object from the given entities. Entities already in the Widget's selection buffers are ignored.
     template <class EntityIdCollection>
     QItemSelection BuildSelectionFromEntities(const EntityIdCollection& entityIds);
@@ -171,6 +176,7 @@ private:
     AZ::EntityId GetEntityIdFromIndex(const QModelIndex& index) const;
     QModelIndex GetIndexFromEntityId(const AZ::EntityId& entityId) const;
     void ExtractEntityIdsFromSelection(const QItemSelection& selection, AzToolsFramework::EntityIdList& entityIdList) const;
+    void EnableUi(bool enable);
 
     // AzToolsFramework::OutlinerModelNotificationBus::Handler
     // Receive notification from the outliner model that we should scroll

Code/Editor/Plugins/FFMPEGPlugin/CMakeLists.txt

@@ -23,6 +23,7 @@ ly_add_target(
             .
     BUILD_DEPENDENCIES
         PRIVATE
+            3rdParty::Qt::Core
             AZ::AzCore
             Legacy::CryCommon
             Legacy::EditorLib

Code/Editor/Plugins/FFMPEGPlugin/FFMPEGPlugin_precompiled.h

@@ -17,19 +17,8 @@
 /////////////////////////////////////////////////////////////////////////////
 #include <platform.h>
 
-
-/////////////////////////////////////////////////////////////////////////////
-// STL
-/////////////////////////////////////////////////////////////////////////////
-#include <vector>
-#include <list>
-#include <map>
-#include <set>
-#include <algorithm>
-
 /////////////////////////////////////////////////////////////////////////////
 // CRY Stuff ////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
 #include <ISystem.h>
-#include "Util/EditorUtils.h"
 #include "EditorCoreAPI.h"

Code/Editor/Plugins/PerforcePlugin/CMakeLists.txt

@@ -31,6 +31,8 @@ ly_add_target(
             .
     BUILD_DEPENDENCIES
         PRIVATE
+            3rdParty::Qt::Core
+            3rdParty::Qt::Widgets
             AZ::AzCore
             Legacy::CryCommon
             Legacy::EditorLib