Merge branch 'main' into Spawnable/ProductDependency

Code/Framework/AzCore/AzCore/Serialization/EditContextConstants.inl

@@ -118,6 +118,7 @@ namespace AZ
             const static AZ::Crc32 StringLineEditingCompleteNotify = AZ_CRC("StringLineEditingCompleteNotify", 0x139e5fa9);
 
             const static AZ::Crc32 NameLabelOverride = AZ_CRC("NameLabelOverride", 0x9ff79cab);
+            const static AZ::Crc32 AssetPickerTitle = AZ_CRC_CE("AssetPickerTitle");
             const static AZ::Crc32 ChildNameLabelOverride = AZ_CRC("ChildNameLabelOverride", 0x73dd2909);
             //! Container attribute that is used to override labels for its elements given the index of the element
             const static AZ::Crc32 IndexedChildNameLabelOverride = AZ_CRC("IndexedChildNameLabelOverride", 0x5f313ac2);

Code/Framework/AzCore/AzCore/Serialization/Json/ByteStreamSerializer.cpp

@@ -10,91 +10,75 @@
  *
  */
 
-#include "ByteStreamSerializer.h"
-
 #include <AzCore/Casting/numeric_cast.h>
 #include <AzCore/Memory/SystemAllocator.h>
+#include <AzCore/Serialization/Json/ByteStreamSerializer.h>
 #include <AzCore/Serialization/Json/JsonSerialization.h>
 #include <AzCore/StringFunc/StringFunc.h>
 
 namespace AZ
 {
-    namespace ByteSerializerInternal
-    {
-        static JsonSerializationResult::Result Load(void* outputValue, const rapidjson::Value& inputValue, JsonDeserializerContext& context)
-        {
-            using JsonSerializationResult::Outcomes;
-            using JsonSerializationResult::Tasks;
-
-            AZ_Assert(outputValue, "Expected a valid pointer to load from json value.");
-
-            switch (inputValue.GetType())
-            {
-            case rapidjson::kStringType: {
-                JsonByteStream buffer;
-                if (AZ::StringFunc::Base64::Decode(buffer, inputValue.GetString(), inputValue.GetStringLength()))
-                {
-                    JsonByteStream* valAsByteStream = static_cast<JsonByteStream*>(outputValue);
-                    *valAsByteStream = AZStd::move(buffer);
-                    return context.Report(Tasks::ReadField, Outcomes::Success, "Successfully read ByteStream.");
-                }
-                return context.Report(Tasks::ReadField, Outcomes::Invalid, "Decode of Base64 encoded ByteStream failed.");
-            }
-            case rapidjson::kArrayType:
-            case rapidjson::kObjectType:
-            case rapidjson::kNullType:
-            case rapidjson::kFalseType:
-            case rapidjson::kTrueType:
-            case rapidjson::kNumberType:
-                return context.Report(
-                    Tasks::ReadField, Outcomes::Unsupported,
-                    "Unsupported type. ByteStream values cannot be read from arrays, objects, nulls, booleans or numbers.");
-            default:
-                return context.Report(Tasks::ReadField, Outcomes::Unknown, "Unknown json type encountered for ByteStream value.");
-            }
-        }
-
-        static JsonSerializationResult::Result StoreWithDefault(
-            rapidjson::Value& outputValue, const void* inputValue, const void* defaultValue, JsonSerializerContext& context)
-        {
-            using JsonSerializationResult::Outcomes;
-            using JsonSerializationResult::Tasks;
-
-            const JsonByteStream& valAsByteStream = *static_cast<const JsonByteStream*>(inputValue);
-            if (context.ShouldKeepDefaults() || !defaultValue || (valAsByteStream != *static_cast<const JsonByteStream*>(defaultValue)))
-            {
-                const auto base64ByteStream = AZ::StringFunc::Base64::Encode(valAsByteStream.data(), valAsByteStream.size());
-                outputValue.SetString(base64ByteStream.c_str(), base64ByteStream.size(), context.GetJsonAllocator());
-                return context.Report(Tasks::WriteValue, Outcomes::Success, "ByteStream successfully stored.");
-            }
-
-            return context.Report(Tasks::WriteValue, Outcomes::DefaultsUsed, "Default ByteStream used.");
-        }
-    } // namespace ByteSerializerInternal
-
     AZ_CLASS_ALLOCATOR_IMPL(JsonByteStreamSerializer, SystemAllocator, 0);
 
     JsonSerializationResult::Result JsonByteStreamSerializer::Load(
         void* outputValue, [[maybe_unused]] const Uuid& outputValueTypeId, const rapidjson::Value& inputValue,
         JsonDeserializerContext& context)
     {
+        using JsonSerializationResult::Outcomes;
+        using JsonSerializationResult::Tasks;
+
         AZ_Assert(
             azrtti_typeid<JsonByteStream>() == outputValueTypeId,
             "Unable to deserialize AZStd::vector<AZ::u8>> to json because the provided type is %s",
             outputValueTypeId.ToString<AZStd::string>().c_str());
+        AZ_Assert(outputValue, "Expected a valid pointer to load from json value.");
 
-        return ByteSerializerInternal::Load(outputValue, inputValue, context);
+        switch (inputValue.GetType())
+        {
+        case rapidjson::kStringType: {
+            JsonByteStream buffer;
+            if (AZ::StringFunc::Base64::Decode(buffer, inputValue.GetString(), inputValue.GetStringLength()))
+            {
+                JsonByteStream* valAsByteStream = static_cast<JsonByteStream*>(outputValue);
+                *valAsByteStream = AZStd::move(buffer);
+                return context.Report(Tasks::ReadField, Outcomes::Success, "Successfully read ByteStream.");
+            }
+            return context.Report(Tasks::ReadField, Outcomes::Invalid, "Decode of Base64 encoded ByteStream failed.");
+        }
+        case rapidjson::kArrayType:
+        case rapidjson::kObjectType:
+        case rapidjson::kNullType:
+        case rapidjson::kFalseType:
+        case rapidjson::kTrueType:
+        case rapidjson::kNumberType:
+            return context.Report(
+                Tasks::ReadField, Outcomes::Unsupported,
+                "Unsupported type. ByteStream values cannot be read from arrays, objects, nulls, booleans or numbers.");
+        default:
+            return context.Report(Tasks::ReadField, Outcomes::Unknown, "Unknown json type encountered for ByteStream value.");
+        }
     }
 
     JsonSerializationResult::Result JsonByteStreamSerializer::Store(
         rapidjson::Value& outputValue, const void* inputValue, const void* defaultValue, [[maybe_unused]] const Uuid& valueTypeId,
         JsonSerializerContext& context)
     {
+        using JsonSerializationResult::Outcomes;
+        using JsonSerializationResult::Tasks;
+
         AZ_Assert(
             azrtti_typeid<JsonByteStream>() == valueTypeId,
             "Unable to serialize AZStd::vector<AZ::u8> to json because the provided type is %s",
             valueTypeId.ToString<AZStd::string>().c_str());
 
-        return ByteSerializerInternal::StoreWithDefault(outputValue, inputValue, defaultValue, context);
+        const JsonByteStream& valAsByteStream = *static_cast<const JsonByteStream*>(inputValue);
+        if (context.ShouldKeepDefaults() || !defaultValue || (valAsByteStream != *static_cast<const JsonByteStream*>(defaultValue)))
+        {
+            const auto base64ByteStream = AZ::StringFunc::Base64::Encode(valAsByteStream.data(), valAsByteStream.size());
+            outputValue.SetString(base64ByteStream.c_str(), base64ByteStream.size(), context.GetJsonAllocator());
+            return context.Report(Tasks::WriteValue, Outcomes::Success, "ByteStream successfully stored.");
+        }
+
+        return context.Report(Tasks::WriteValue, Outcomes::DefaultsUsed, "Default ByteStream used.");
     }
 } // namespace AZ

Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializer.cpp

@@ -104,13 +104,12 @@ namespace AZ
         auto serializer = context.GetRegistrationContext()->GetSerializerForType(classData.m_typeId);
         if (serializer)
         {
-            if (storeTypeId == StoreTypeId::Yes)
+            ResultCode result = serializer->Store(node, object, defaultObject, classData.m_typeId, context);
+            if (storeTypeId == StoreTypeId::Yes && result.GetProcessing() != Processing::Halted)
             {
-                return context.Report(Tasks::WriteValue, Outcomes::Catastrophic,
-                    "Unable to store type information in a JSON Serializer primitive.");
+                result.Combine(InsertTypeId(node, classData, context));
             }
-
-            return serializer->Store(node, object, defaultObject, classData.m_typeId, context);
+            return result;
         }
 
         if (classData.m_azRtti && (classData.m_azRtti->GetTypeTraits() & AZ::TypeTraits::is_enum) == AZ::TypeTraits::is_enum)
@@ -128,13 +127,12 @@ namespace AZ
             serializer = context.GetRegistrationContext()->GetSerializerForType(classData.m_azRtti->GetGenericTypeId());
             if (serializer)
             {
-                if (storeTypeId == StoreTypeId::Yes)
+                ResultCode result = serializer->Store(node, object, defaultObject, classData.m_typeId, context);
+                if (storeTypeId == StoreTypeId::Yes && result.GetProcessing() != Processing::Halted)
                 {
-                    return context.Report(Tasks::WriteValue, Outcomes::Catastrophic,
-                        "Unable to store type information in a JSON Serializer primitive.");
+                    result.Combine(InsertTypeId(node, classData, context));
                 }
-
-                return serializer->Store(node, object, defaultObject, classData.m_typeId, context);
+                return result;
             }
         }
         
@@ -149,6 +147,7 @@ namespace AZ
             ResultCode result(Tasks::WriteValue);
             if (storeTypeId == StoreTypeId::Yes)
             {
+                // Not using InsertTypeId here to avoid needing to create the temporary value and swap it in that call.
                 node.AddMember(rapidjson::StringRef(JsonSerialization::TypeIdFieldIdentifier),
                     StoreTypeName(classData, context), context.GetJsonAllocator());
                 result = ResultCode(Tasks::WriteValue, Outcomes::Success);
@@ -569,6 +568,31 @@ namespace AZ
         }
     }
 
+    JsonSerializationResult::ResultCode JsonSerializer::InsertTypeId(
+        rapidjson::Value& output, const SerializeContext::ClassData& classData, JsonSerializerContext& context)
+    {
+        using namespace JsonSerializationResult;
+
+        if (output.IsObject())
+        {
+            rapidjson::Value insertedObject(rapidjson::kObjectType);
+            insertedObject.AddMember(
+                rapidjson::StringRef(JsonSerialization::TypeIdFieldIdentifier), StoreTypeName(classData, context),
+                context.GetJsonAllocator());
+
+            for (auto& element : output.GetObject())
+            {
+                insertedObject.AddMember(AZStd::move(element.name), AZStd::move(element.value), context.GetJsonAllocator());
+            }
+            output = AZStd::move(insertedObject);
+            return ResultCode(Tasks::WriteValue, Outcomes::Success);
+        }
+        else
+        {
+            return context.Report(Tasks::WriteValue, Outcomes::Catastrophic, "Only able to store type information in a JSON Object.");
+        }
+    }
+
     rapidjson::Value JsonSerializer::GetExplicitDefault()
     {
         return rapidjson::Value(rapidjson::kObjectType);

Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializer.h

@@ -80,6 +80,9 @@ namespace AZ
         static JsonSerializationResult::ResultCode StoreTypeName(rapidjson::Value& output,
             const Uuid& typeId, JsonSerializerContext& context);
 
+        static JsonSerializationResult::ResultCode InsertTypeId(
+            rapidjson::Value& output, const SerializeContext::ClassData& classData, JsonSerializerContext& context);
+
         static rapidjson::Value GetExplicitDefault();
     };
 } // namespace AZ

Code/Framework/AzCore/Tests/Serialization/Json/JsonSerializationTests.cpp

@@ -449,6 +449,46 @@ namespace JsonSerializationTests
 
     }
 
+    TEST_F(JsonSerializationTests, Load_PrimitiveForInheritedClass_LoadsCorrectClass)
+    {
+        using namespace AZ::JsonSerializationResult;
+        using namespace ::testing;
+
+        AZStd::string json = AZStd::string::format(R"(
+            {
+                "%s": "SimpleInheritence",
+                "base_var": -88.0,
+                "var1": 88,
+                "var2": 42
+            })",
+            AZ::JsonSerialization::TypeIdFieldIdentifier);
+        m_jsonDocument->Parse(json.c_str());
+
+        SimpleInheritence::Reflect(m_serializeContext, true);
+        m_serializeContext->RegisterGenericType<AZStd::unique_ptr<BaseClass>>();
+        m_jsonRegistrationContext->Serializer<JsonSerializerMock>()->HandlesType<SimpleInheritence>();
+        JsonSerializerMock* mock =
+            reinterpret_cast<JsonSerializerMock*>(m_jsonRegistrationContext->GetSerializerForType(azrtti_typeid<SimpleInheritence>()));
+        EXPECT_CALL(*mock, Load(_, _, _, _))
+            .Times(Exactly(1))
+            .WillRepeatedly(Return(Result(m_deserializationSettings->m_reporting, "Test", Tasks::ReadField, Outcomes::Success, "")));
+
+        AZStd::unique_ptr<BaseClass> instance;
+        ResultCode result = AZ::JsonSerialization::Load(instance, *m_jsonDocument, *m_deserializationSettings);
+        EXPECT_NE(Processing::Halted, result.GetProcessing());
+
+        EXPECT_EQ(azrtti_typeid<SimpleInheritence>(), azrtti_typeid(*instance));
+
+        m_serializeContext->EnableRemoveReflection();
+        SimpleInheritence::Reflect(m_serializeContext, true);
+        m_serializeContext->DisableRemoveReflection();
+
+        m_jsonRegistrationContext->EnableRemoveReflection();
+        m_serializeContext->RegisterGenericType<AZStd::unique_ptr<BaseClass>>();
+        m_jsonRegistrationContext->Serializer<JsonSerializerMock>()->HandlesType<SimpleInheritence>();
+        m_jsonRegistrationContext->DisableRemoveReflection();
+    }
+
     TEST_F(JsonSerializationTests, Store_TemplatedClassWithRegisteredHandler_StoreOnHandlerCalled)
     {
         using namespace AZ::JsonSerializationResult;
@@ -474,6 +514,52 @@ namespace JsonSerializationTests
         m_jsonRegistrationContext->DisableRemoveReflection();
     }
 
+    TEST_F(JsonSerializationTests, Store_PrimitiveForInheritedClass_StoreSucceedsAndTypeIdIsAdded)
+    {
+        using namespace AZ::JsonSerializationResult;
+        using namespace ::testing;
+
+        SimpleInheritence::Reflect(m_serializeContext, true);
+        m_serializeContext->RegisterGenericType<AZStd::unique_ptr<BaseClass>>();
+        m_jsonRegistrationContext->Serializer<JsonSerializerMock>()->HandlesType<SimpleInheritence>();
+        JsonSerializerMock* mock =
+            reinterpret_cast<JsonSerializerMock*>(m_jsonRegistrationContext->GetSerializerForType(azrtti_typeid<SimpleInheritence>()));
+        EXPECT_CALL(*mock, Store(_, _, _, _, _))
+            .Times(Exactly(1))
+            .WillRepeatedly(Invoke([](rapidjson::Value& output, const void*, const void*, const AZ::Uuid&, AZ::JsonSerializerContext& context)
+                {
+                    // Insert some values to allow verification later on.
+                    output.SetObject();
+                    output.AddMember("base_var", -88.0, context.GetJsonAllocator());
+                    output.AddMember("var1", 88, context.GetJsonAllocator());
+                    output.AddMember("var2", 42, context.GetJsonAllocator());
+                    return context.Report(Tasks::WriteValue, Outcomes::Success, "");
+                }));
+
+        AZStd::unique_ptr<BaseClass> instance{ aznew SimpleInheritence() };
+        ResultCode result = AZ::JsonSerialization::Store(*m_jsonDocument, m_jsonDocument->GetAllocator(), instance, *m_serializationSettings);
+        EXPECT_NE(Processing::Halted, result.GetProcessing());
+
+        AZStd::string compare = AZStd::string::format(R"(
+            {
+                "%s": "SimpleInheritence",
+                "base_var": -88.0,
+                "var1": 88,
+                "var2": 42
+            })",
+            AZ::JsonSerialization::TypeIdFieldIdentifier);
+        Expect_DocStrEq(compare.c_str());
+
+        m_serializeContext->EnableRemoveReflection();
+        m_serializeContext->RegisterGenericType<AZStd::unique_ptr<BaseClass>>();
+        SimpleInheritence::Reflect(m_serializeContext, true);
+        m_serializeContext->DisableRemoveReflection();
+
+        m_jsonRegistrationContext->EnableRemoveReflection();
+        m_jsonRegistrationContext->Serializer<JsonSerializerMock>()->HandlesType<SimpleInheritence>();
+        m_jsonRegistrationContext->DisableRemoveReflection();
+    }
+
     TEST_F(JsonSerializationTests, Store_StoreWithNullPtr_ReturnsCatastrophic)
     {
         using namespace AZ::JsonSerializationResult;

Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ProgressBar.qss

@@ -24,5 +24,5 @@ QProgressBar
 
 QProgressBar::chunk
 {
-    background: #54AFD0;
+    background: #1E70EB;
 }

Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/PushButtonConfig.ini

@@ -13,14 +13,14 @@ Width=24;
 ArrowWidth=10;
 
 [PrimaryColorSet]
-Disabled\Start=#7092A7
-Disabled\End=#7092A7
-Sunken\Start=#0073BB
-Sunken\End=#0073BB
-Hovered\Start=#44BAFF
-Hovered\End=#4AB2F8
+Disabled\Start=#2A4875
+Disabled\End=#2A4875
+Sunken\Start=#1E70EB
+Sunken\End=#1E70EB
+Hovered\Start=#4ABAFF
+Hovered\End=#94D2FF
 Normal\Start=#0095F2
-Normal\End=#0073BB
+Normal\End=#1E70EB
 
 [SecondaryColorSet]
 Disabled\Start=#666666
@@ -42,10 +42,10 @@ Color=#3D000000
 
 [FocusedBorder]
 Thickness=1
-Color=#00A1C9
+Color=#4B8CEF
 
 [IconButton]
-ActiveColor=#00A1C9
+ActiveColor=#1E70EB
 DisabledColor=#999999
 SelectedColor=#FFFFFF
 

Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SliderConfig.ini

@@ -12,7 +12,7 @@ HandleBorder\Color=#FFFFFF
 HandleBorder\Radius=1.5
 
 [Slider]
-Handle\Color=#0185D7
+Handle\Color=#1E70EB
 Handle\ColorDisabled=#999999
 Handle\Size=12
 Handle\SizeMinusMargin=8

Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Text.cpp

@@ -46,7 +46,7 @@ namespace AzQtComponents
     Text::Config Text::defaultConfig()
     {
         Config config;
-        config.hyperlinkColor = QStringLiteral("#44B2F8");
+        config.hyperlinkColor = QStringLiteral("#94D2FF");
 
         return config;
     }

Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TextConfig.ini

@@ -1,2 +1,2 @@
 [Hyperlink]
-Color=#44B2F8
+Color=#94D2FF

Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/checkbox/off-focus.svg

@@ -4,7 +4,7 @@
     <title>Selection Controls / Checkbox / Off</title>
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Checkbox-/-Off" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="checkbox-(off)" stroke="#00A1C9">
+        <g id="checkbox-(off)" stroke="#4B8CEF">
             <path d="M14.2222222,0.5 L1.77777778,0.5 C1.07614237,0.5 0.5,1.07614237 0.5,1.77777778 L0.5,14.2222222 C0.5,14.9238576 1.07614237,15.5 1.77777778,15.5 L14.2222222,15.5 C14.9238576,15.5 15.5,14.9238576 15.5,14.2222222 L15.5,1.77777778 C15.5,1.07614237 14.9238576,0.5 14.2222222,0.5 Z" id="Shape"></path>
         </g>
     </g>

Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/checkbox/on-disabled.svg

@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Checkbox-/-On---Disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="checkbox-(on)">
-            <path d="M1.77777778,0 C0.8,0 0,0.8 0,1.77777778 L0,14.2222222 C0,15.2 0.8,16 1.77777778,16 L14.2222222,16 C15.2,16 16,15.2 16,14.2222222 L16,1.77777778 C16,0.8 15.2,0 14.2222222,0 L1.77777778,0 Z" id="Shape" fill="#7092A7"></path>
+            <path d="M1.77777778,0 C0.8,0 0,0.8 0,1.77777778 L0,14.2222222 C0,15.2 0.8,16 1.77777778,16 L14.2222222,16 C15.2,16 16,15.2 16,14.2222222 L16,1.77777778 C16,0.8 15.2,0 14.2222222,0 L1.77777778,0 Z" id="Shape" fill="#2A4875"></path>
             <polygon id="Path" fill="#BBBBBB" points="1 8.19230769 2.4 6.84615385 6 10.3076923 13.6 3 15 4.34615385 6 13"></polygon>
         </g>
     </g>

Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/checkbox/on-focus.svg

@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Checkbox-/-On-focus" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="checkbox-(on)">
-            <path d="M14.2222222,0.5 L1.77777778,0.5 C1.07614237,0.5 0.5,1.07614237 0.5,1.77777778 L0.5,14.2222222 C0.5,14.9238576 1.07614237,15.5 1.77777778,15.5 L14.2222222,15.5 C14.9238576,15.5 15.5,14.9238576 15.5,14.2222222 L15.5,1.77777778 C15.5,1.07614237 14.9238576,0.5 14.2222222,0.5 Z" id="Shape" stroke="#00A1C9" fill="#0073BB"></path>
+            <path d="M14.2222222,0.5 L1.77777778,0.5 C1.07614237,0.5 0.5,1.07614237 0.5,1.77777778 L0.5,14.2222222 C0.5,14.9238576 1.07614237,15.5 1.77777778,15.5 L14.2222222,15.5 C14.9238576,15.5 15.5,14.9238576 15.5,14.2222222 L15.5,1.77777778 C15.5,1.07614237 14.9238576,0.5 14.2222222,0.5 Z" id="Shape" stroke="#4B8CEF" fill="#1E70EB"></path>
             <polygon id="Path" fill="#FFFFFF" points="1 8.19230769 2.4 6.84615385 6 10.3076923 13.6 3 15 4.34615385 6 13"></polygon>
         </g>
     </g>

Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/checkbox/on.svg

@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Checkbox-/-On" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="checkbox-(on)">
-            <path d="M1.77777778,0 C0.8,0 0,0.8 0,1.77777778 L0,14.2222222 C0,15.2 0.8,16 1.77777778,16 L14.2222222,16 C15.2,16 16,15.2 16,14.2222222 L16,1.77777778 C16,0.8 15.2,0 14.2222222,0 L1.77777778,0 Z" id="Shape" fill="#0073BB"></path>
+            <path d="M1.77777778,0 C0.8,0 0,0.8 0,1.77777778 L0,14.2222222 C0,15.2 0.8,16 1.77777778,16 L14.2222222,16 C15.2,16 16,15.2 16,14.2222222 L16,1.77777778 C16,0.8 15.2,0 14.2222222,0 L1.77777778,0 Z" id="Shape" fill="#1E70EB"></path>
             <polygon id="Path" fill="#FFFFFF" points="1 8.19230769 2.4 6.84615385 6 10.3076923 13.6 3 15 4.34615385 6 13"></polygon>
         </g>
     </g>

Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/checkbox/partial-selected-disabled.svg

@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Checkbox-/-Partial-Selected" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="Group">
-            <rect id="Rectangle-10" fill="#7092A7" x="0" y="0" width="16" height="16" rx="2"></rect>
+            <rect id="Rectangle-10" fill="#2A4875" x="0" y="0" width="16" height="16" rx="2"></rect>
             <rect id="Rectangle-9" fill="#BBBBBB" x="3" y="7" width="10" height="2"></rect>
         </g>
     </g>

Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/checkbox/partial-selected-focus.svg

@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Checkbox-/-Partial-Selected" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="Group">
-            <path d="M14.2222222,0.5 L1.77777778,0.5 C1.07614237,0.5 0.5,1.07614237 0.5,1.77777778 L0.5,14.2222222 C0.5,14.9238576 1.07614237,15.5 1.77777778,15.5 L14.2222222,15.5 C14.9238576,15.5 15.5,14.9238576 15.5,14.2222222 L15.5,1.77777778 C15.5,1.07614237 14.9238576,0.5 14.2222222,0.5 Z" id="Shape" stroke="#00A1C9" fill="#0073BB"></path>
+            <path d="M14.2222222,0.5 L1.77777778,0.5 C1.07614237,0.5 0.5,1.07614237 0.5,1.77777778 L0.5,14.2222222 C0.5,14.9238576 1.07614237,15.5 1.77777778,15.5 L14.2222222,15.5 C14.9238576,15.5 15.5,14.9238576 15.5,14.2222222 L15.5,1.77777778 C15.5,1.07614237 14.9238576,0.5 14.2222222,0.5 Z" id="Shape" stroke="#4B8CEF" fill="#1E70EB"></path>
             <rect id="Rectangle-9" fill="#FFFFFF" x="3" y="7" width="10" height="2"></rect>
         </g>
     </g>

Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/checkbox/partial-selected.svg

@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Checkbox-/-Partial-Selected" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="Group">
-            <rect id="Rectangle-10" fill="#0073BB" x="0" y="0" width="16" height="16" rx="2"></rect>
+            <rect id="Rectangle-10" fill="#1E70EB" x="0" y="0" width="16" height="16" rx="2"></rect>
             <rect id="Rectangle-9" fill="#FFFFFF" x="3" y="7" width="10" height="2"></rect>
         </g>
     </g>

Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/radiobutton/checked-disabled.svg

@@ -4,7 +4,7 @@
     <title>Selection Controls / Radio Button / On - Disabled</title>
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Radio-Button-/-On---Disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <circle id="Oval" fill="#7092A7" cx="8" cy="8" r="8"></circle>
+        <circle id="Oval" fill="#2A4875" cx="8" cy="8" r="8"></circle>
         <circle id="Oval" fill="#BBBBBB" cx="8" cy="8" r="4"></circle>
     </g>
 </svg>

Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/radiobutton/checked-focus.svg

@@ -4,7 +4,7 @@
     <title>Selection Controls / Radio Button / On-focus</title>
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Radio-Button-/-On-focus" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <circle id="Oval" stroke="#00A1C9" fill="#0073BB" cx="9" cy="9" r="8.5"></circle>
+        <circle id="Oval" stroke="#4B8CEF" fill="#1E70EB" cx="9" cy="9" r="8.5"></circle>
         <circle id="Oval" fill="#FFFFFF" cx="9" cy="9" r="4"></circle>
     </g>
 </svg>

Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/radiobutton/checked.svg

@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Radio-Button-/-On" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="radio-button-(on)">
-            <circle id="Oval" fill="#0073BB" cx="8" cy="8" r="8"></circle>
+            <circle id="Oval" fill="#1E70EB" cx="8" cy="8" r="8"></circle>
             <circle id="Oval" fill="#FFFFFF" cx="8" cy="8" r="4"></circle>
         </g>
     </g>

Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/radiobutton/unchecked-focus.svg

@@ -4,7 +4,7 @@
     <title>Selection Controls / Radio Button / Off-focus</title>
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Radio-Button-/-Off-focus" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="radio-button-(off)" transform="translate(1.000000, 1.000000)" stroke="#00A1C9">
+        <g id="radio-button-(off)" transform="translate(1.000000, 1.000000)" stroke="#4B8CEF">
             <circle id="Oval" cx="8" cy="8" r="8.5"></circle>
         </g>
     </g>

Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toggleswitch/checked-disabled.svg

@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Switch-/-On---Disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="switch-(on)">
-            <path d="M25.4117647,16 L6.58823529,16 C2.91764706,16 0,12.4571429 0,8 C0,3.54285714 2.91764706,0 6.58823529,0 L25.4117647,0 C29.0823529,0 32,3.54285714 32,8 C32,12.4571429 29.0823529,16 25.4117647,16 Z" id="track" fill="#7092A7"></path>
+            <path d="M25.4117647,16 L6.58823529,16 C2.91764706,16 0,12.4571429 0,8 C0,3.54285714 2.91764706,0 6.58823529,0 L25.4117647,0 C29.0823529,0 32,3.54285714 32,8 C32,12.4571429 29.0823529,16 25.4117647,16 Z" id="track" fill="#2A4875"></path>
             <circle id="knob" fill="#BBBBBB" cx="24" cy="8" r="6"></circle>
         </g>
     </g>

Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toggleswitch/checked-focus.svg

@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Switch-/-On-focus" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="switch-(on)" transform="translate(1.000000, 1.000000)">
-            <path d="M25.4117647,16.5 L6.58823529,16.5 C2.61773665,16.5 -0.5,12.7141769 -0.5,8 C-0.5,3.28582307 2.61773665,-0.5 6.58823529,-0.5 L25.4117647,-0.5 C29.3822634,-0.5 32.5,3.28582307 32.5,8 C32.5,12.7141769 29.3822634,16.5 25.4117647,16.5 Z" id="track" stroke="#00A1C9" fill="#0073BB"></path>
+            <path d="M25.4117647,16.5 L6.58823529,16.5 C2.61773665,16.5 -0.5,12.7141769 -0.5,8 C-0.5,3.28582307 2.61773665,-0.5 6.58823529,-0.5 L25.4117647,-0.5 C29.3822634,-0.5 32.5,3.28582307 32.5,8 C32.5,12.7141769 29.3822634,16.5 25.4117647,16.5 Z" id="track" stroke="#4B8CEF" fill="#1E70EB"></path>
             <circle id="knob" fill="#FFFFFF" cx="24" cy="8" r="6"></circle>
         </g>
     </g>

Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toggleswitch/checked.svg

@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Switch-/-On" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="switch-(on)">
-            <path d="M25.4117647,16 L6.58823529,16 C2.91764706,16 0,12.4571429 0,8 C0,3.54285714 2.91764706,0 6.58823529,0 L25.4117647,0 C29.0823529,0 32,3.54285714 32,8 C32,12.4571429 29.0823529,16 25.4117647,16 Z" id="track" fill="#0073BB"></path>
+            <path d="M25.4117647,16 L6.58823529,16 C2.91764706,16 0,12.4571429 0,8 C0,3.54285714 2.91764706,0 6.58823529,0 L25.4117647,0 C29.0823529,0 32,3.54285714 32,8 C32,12.4571429 29.0823529,16 25.4117647,16 Z" id="track" fill="#1E70EB"></path>
             <circle id="knob" fill="#FFFFFF" cx="24" cy="8" r="6"></circle>
         </g>
     </g>

Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toggleswitch/unchecked-focus.svg

@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Switch-/-Off-focus" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="switch-(off)" transform="translate(1.000000, 1.000000)">
-            <path d="M25.0231909,16.5 L7.01632718,16.5 C2.97419648,16.5 -0.5,12.6299076 -0.5,8 C-0.5,3.37009242 2.97419648,-0.5 7.01632718,-0.5 L25.0231909,-0.5 C29.0586432,-0.5 32.5,3.36297526 32.5,8 C32.5,12.6370247 29.0586432,16.5 25.0231909,16.5 Z" id="track" stroke="#00A1C9"></path>
+            <path d="M25.0231909,16.5 L7.01632718,16.5 C2.97419648,16.5 -0.5,12.6299076 -0.5,8 C-0.5,3.37009242 2.97419648,-0.5 7.01632718,-0.5 L25.0231909,-0.5 C29.0586432,-0.5 32.5,3.36297526 32.5,8 C32.5,12.6370247 29.0586432,16.5 25.0231909,16.5 Z" id="track" stroke="#4B8CEF"></path>
             <circle id="knob" fill="#FFFFFF" cx="8" cy="8" r="6"></circle>
         </g>
     </g>

Code/Framework/AzQtComponents/AzQtComponents/Components/img/loading.svg

@@ -1,6 +1,6 @@
  <svg version="1.1" class="loader" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
  width="40px" height="40px" viewBox="0 0 50 50" style="enable-background:new 0 0 50 50;" xml:space="preserve">
-  <path fill="#54AFD0" d="M43.935,25.145c0-10.318-8.364-18.683-18.683-18.683c-10.318,0-18.683,8.365-18.683,18.683h4.068c0-8.071,6.543-14.615,14.615-14.615c8.072,0,14.615,6.543,14.615,14.615H43.935z">
+  <path fill="#1E70EB" d="M43.935,25.145c0-10.318-8.364-18.683-18.683-18.683c-10.318,0-18.683,8.365-18.683,18.683h4.068c0-8.071,6.543-14.615,14.615-14.615c8.072,0,14.615,6.543,14.615,14.615H43.935z">
     <animateTransform attributeType="xml"
       attributeName="transform"
       type="rotate"

Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/FolderThumbnail.cpp

@@ -53,8 +53,8 @@ namespace AzToolsFramework
         static constexpr const char* FolderIconPath = "Editor/Icons/AssetBrowser/Folder_16.svg";
         static constexpr const char* GemIconPath = "Editor/Icons/AssetBrowser/GemFolder_16.svg";
 
-        FolderThumbnail::FolderThumbnail(SharedThumbnailKey key, int thumbnailSize)
-            : Thumbnail(key, thumbnailSize)
+        FolderThumbnail::FolderThumbnail(SharedThumbnailKey key)
+            : Thumbnail(key)
         {}
 
         void FolderThumbnail::LoadThread()
@@ -69,7 +69,8 @@ namespace AzToolsFramework
             AZStd::string absoluteIconPath;
             AZ::StringFunc::Path::Join(engineRoot, folderIcon, absoluteIconPath);
 
-            m_icon = QIcon(absoluteIconPath.c_str());
+            m_pixmap.load(absoluteIconPath.c_str());
+            m_state = m_pixmap.isNull() ? State::Failed : State::Ready;
         }
 
         //////////////////////////////////////////////////////////////////////////

Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/FolderThumbnail.h

@@ -47,7 +47,7 @@ namespace AzToolsFramework
         {
             Q_OBJECT
         public:
-            FolderThumbnail(SharedThumbnailKey key, int thumbnailSize);
+            FolderThumbnail(SharedThumbnailKey key);
             void LoadThread() override;
         };
 

Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/ProductThumbnail.cpp

@@ -57,8 +57,8 @@ namespace AzToolsFramework
         //////////////////////////////////////////////////////////////////////////
         static const char* DEFAULT_PRODUCT_ICON_PATH = "Editor/Icons/AssetBrowser/DefaultProduct_16.svg";
 
-        ProductThumbnail::ProductThumbnail(Thumbnailer::SharedThumbnailKey key, int thumbnailSize)
-            : Thumbnail(key, thumbnailSize)
+        ProductThumbnail::ProductThumbnail(Thumbnailer::SharedThumbnailKey key)
+            : Thumbnail(key)
         {}
 
         void ProductThumbnail::LoadThread() 
@@ -96,12 +96,8 @@ namespace AzToolsFramework
                 iconPath = QString::fromUtf8(DEFAULT_PRODUCT_ICON_PATH);
             }
 
-            m_icon = QIcon(iconPath);
-
-            if (m_icon.isNull())
-            {
-                m_state = State::Failed;
-            }
+            m_pixmap.load(iconPath);
+            m_state = m_pixmap.isNull() ? State::Failed : State::Ready;
         }
 
         //////////////////////////////////////////////////////////////////////////

Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/ProductThumbnail.h

@@ -44,7 +44,7 @@ namespace AzToolsFramework
         {
             Q_OBJECT
         public:
-            ProductThumbnail(Thumbnailer::SharedThumbnailKey key, int thumbnailSize);
+            ProductThumbnail(Thumbnailer::SharedThumbnailKey key);
 
         protected:
             void LoadThread() override;

Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/SourceThumbnail.cpp

@@ -58,8 +58,8 @@ namespace AzToolsFramework
         static constexpr const char* DefaultFileIconPath = "Editor/Icons/AssetBrowser/Default_16.svg";
         QMutex SourceThumbnail::m_mutex;
 
-        SourceThumbnail::SourceThumbnail(SharedThumbnailKey key, int thumbnailSize)
-            : Thumbnail(key, thumbnailSize)
+        SourceThumbnail::SourceThumbnail(SharedThumbnailKey key)
+            : Thumbnail(key)
         {
         }
 
@@ -124,7 +124,8 @@ namespace AzToolsFramework
                 iconPathToUse = iconPath.c_str();
             }
 
-            m_icon = QIcon(iconPathToUse);
+            m_pixmap.load(iconPathToUse);
+            m_state = m_pixmap.isNull() ? State::Failed : State::Ready;
         }
 
         //////////////////////////////////////////////////////////////////////////

Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/SourceThumbnail.h

@@ -44,7 +44,7 @@ namespace AzToolsFramework
         {
             Q_OBJECT
         public:
-            SourceThumbnail(SharedThumbnailKey key, int thumbnailSize);
+            SourceThumbnail(SharedThumbnailKey key);
 
         protected:
             void LoadThread() override;

Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/EntryDelegate.cpp

@@ -140,7 +140,7 @@ namespace AzToolsFramework
             else
             {
                 // Scaling and centering pixmap within bounds to preserve aspect ratio
-                const QPixmap pixmap = thumbnail->GetPixmap(size).scaled(size, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+                const QPixmap pixmap = thumbnail->GetPixmap().scaled(size, Qt::KeepAspectRatio, Qt::SmoothTransformation);
                 const QSize sizeDelta = size - pixmap.size();
                 const QPoint pointDelta = QPoint(sizeDelta.width() / 2, sizeDelta.height() / 2);
                 painter->drawPixmap(point + pointDelta, pixmap);

Code/Framework/AzToolsFramework/AzToolsFramework/MaterialBrowser/MaterialBrowserComponent.cpp

@@ -36,8 +36,7 @@ namespace AzToolsFramework
             using namespace Thumbnailer;
             using namespace AssetBrowser;
             const char* contextName = "MaterialBrowser";
-            int thumbnailSize = qApp->style()->pixelMetric(QStyle::PM_SmallIconSize);
-            ThumbnailerRequestsBus::Broadcast(&ThumbnailerRequests::RegisterContext, contextName, thumbnailSize);
+            ThumbnailerRequestsBus::Broadcast(&ThumbnailerRequests::RegisterContext, contextName);
             ThumbnailerRequestsBus::Broadcast(&ThumbnailerRequests::RegisterThumbnailProvider, MAKE_TCACHE(FolderThumbnailCache), contextName);
             ThumbnailerRequestsBus::Broadcast(&ThumbnailerRequests::RegisterThumbnailProvider, MAKE_TCACHE(SourceThumbnailCache), contextName);
             ThumbnailerRequestsBus::Broadcast(&ThumbnailerRequests::RegisterThumbnailProvider, MAKE_TCACHE(MaterialThumbnailCache), contextName);

Code/Framework/AzToolsFramework/AzToolsFramework/MaterialBrowser/MaterialThumbnail.cpp

@@ -24,8 +24,8 @@ namespace AzToolsFramework
         //////////////////////////////////////////////////////////////////////////
         // MaterialThumbnail
         //////////////////////////////////////////////////////////////////////////
-        MaterialThumbnail::MaterialThumbnail(Thumbnailer::SharedThumbnailKey key, int thumbnailSize)
-            : Thumbnail(key, thumbnailSize)
+        MaterialThumbnail::MaterialThumbnail(Thumbnailer::SharedThumbnailKey key)
+            : Thumbnail(key)
         {
             auto productKey = azrtti_cast<const AzToolsFramework::AssetBrowser::ProductThumbnailKey*>(m_key.data());
             AZ_Assert(productKey, "Incorrect key type, excpected ProductThumbnailKey");
@@ -34,7 +34,8 @@ namespace AzToolsFramework
             MaterialBrowserRequestBus::BroadcastResult(multiMat, &MaterialBrowserRequests::IsMultiMaterial, productKey->GetAssetId());
 
             QString iconPath = multiMat ? MultiMaterialIconPath : SimpleMaterialIconPath;
-            m_pixmap = QPixmap(iconPath).scaled(m_thumbnailSize, m_thumbnailSize, Qt::KeepAspectRatio);
+            m_pixmap.load(iconPath);
+            m_state = m_pixmap.isNull() ? State::Failed : State::Ready;
         }
 
         //////////////////////////////////////////////////////////////////////////

Code/Framework/AzToolsFramework/AzToolsFramework/MaterialBrowser/MaterialThumbnail.h

@@ -28,7 +28,7 @@ namespace AzToolsFramework
         {
             Q_OBJECT
         public:
-            MaterialThumbnail(Thumbnailer::SharedThumbnailKey key, int thumbnailSize);
+            MaterialThumbnail(Thumbnailer::SharedThumbnailKey key);
         };
 
         namespace

Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/EditorPrefabComponent.cpp

@@ -16,7 +16,6 @@
 #include <AzCore/Serialization/EditContext.h>
 #include <AzToolsFramework/Prefab/PrefabPublicInterface.h>
 #include <AzToolsFramework/UI/EditorEntityUi/EditorEntityUiInterface.h>
-#include <AzToolsFramework/UI/Outliner/EntityOutlinerWidgetInterface.h>
 #include <AzToolsFramework/UI/Prefab/PrefabIntegrationBus.h>
 
 namespace AzToolsFramework

Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceUpdateExecutor.cpp

@@ -21,9 +21,9 @@
 #include <AzToolsFramework/Prefab/Instance/TemplateInstanceMapperInterface.h>
 #include <AzToolsFramework/Prefab/PrefabDomUtils.h>
 #include <AzToolsFramework/Prefab/PrefabPublicInterface.h>
+#include <AzToolsFramework/Prefab/PrefabPublicNotificationBus.h>
 #include <AzToolsFramework/Prefab/PrefabSystemComponentInterface.h>
 #include <AzToolsFramework/Prefab/Template/Template.h>
-#include <AzToolsFramework/UI/Outliner/EntityOutlinerWidgetInterface.h>
 
 namespace AzToolsFramework
 {
@@ -90,17 +90,13 @@ namespace AzToolsFramework
 
                 if (instanceCountToUpdateInBatch > 0)
                 {
+                    // Notify Propagation has begun
+                    PrefabPublicNotificationBus::Broadcast(&PrefabPublicNotifications::OnPrefabInstancePropagationBegin);
+
                     EntityIdList selectedEntityIds;
                     ToolsApplicationRequestBus::BroadcastResult(selectedEntityIds, &ToolsApplicationRequests::GetSelectedEntities);
                     ToolsApplicationRequestBus::Broadcast(&ToolsApplicationRequests::SetSelectedEntities, EntityIdList());
 
-                    // Disable the Outliner to avoid showing the propagation steps
-                    EntityOutlinerWidgetInterface* entityOutlinerWidgetInterface = AZ::Interface<EntityOutlinerWidgetInterface>::Get();
-                    if (entityOutlinerWidgetInterface)
-                    {
-                        entityOutlinerWidgetInterface->SetUpdatesEnabled(false);
-                    }
-
                     for (int i = 0; i < instanceCountToUpdateInBatch; ++i)
                     {
                         Instance* instanceToUpdate = m_instancesUpdateQueue.front();
@@ -168,18 +164,8 @@ namespace AzToolsFramework
                     }
                     ToolsApplicationRequestBus::Broadcast(&ToolsApplicationRequests::SetSelectedEntities, selectedEntityIds);
 
-                    // Enable the Outliner
-                    if (entityOutlinerWidgetInterface)
-                    {
-                        entityOutlinerWidgetInterface->SetUpdatesEnabled(true);
-
-                        auto prefabPublicInterface = AZ::Interface<PrefabPublicInterface>::Get();
-                        if (prefabPublicInterface)
-                        {
-                            AZ::EntityId rootEntityId = prefabPublicInterface->GetLevelInstanceContainerEntityId();
-                            entityOutlinerWidgetInterface->ExpandEntityChildren(rootEntityId);
-                        }
-                    }
+                    // Notify Propagation has ended
+                    PrefabPublicNotificationBus::Broadcast(&PrefabPublicNotifications::OnPrefabInstancePropagationEnd);
                 }
 
                 m_updatingTemplateInstancesInQueue = false;

Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicNotificationBus.h

@@ -0,0 +1,34 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+
+#pragma once
+
+#include <AzCore/EBus/EBus.h>
+
+namespace AzToolsFramework
+{
+    namespace Prefab
+    {
+        class PrefabPublicNotifications
+            : public AZ::EBusTraits
+        {
+        public:
+            virtual ~PrefabPublicNotifications() = default;
+
+            virtual void OnPrefabInstancePropagationBegin() {}
+            virtual void OnPrefabInstancePropagationEnd() {}
+        };
+
+        using PrefabPublicNotificationBus = AZ::EBus<PrefabPublicNotifications>;
+
+    } // namespace Prefab
+} // namespace AzToolsFramework

Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/LoadingThumbnail.cpp

@@ -18,13 +18,15 @@ namespace AzToolsFramework
 {
     namespace Thumbnailer
     {
+        static constexpr const int LoadingThumbnailSize = 128;
+
         //////////////////////////////////////////////////////////////////////////
         // LoadingThumbnail
         //////////////////////////////////////////////////////////////////////////
         static const char* LoadingIconPath = "Editor/Icons/AssetBrowser/in_progress.gif";
 
-        LoadingThumbnail::LoadingThumbnail(int thumbnailSize)
-            : Thumbnail(MAKE_TKEY(ThumbnailKey), thumbnailSize)
+        LoadingThumbnail::LoadingThumbnail()
+            : Thumbnail(MAKE_TKEY(ThumbnailKey))
             , m_angle(0)
         {
             const char* engineRoot = nullptr;
@@ -34,7 +36,7 @@ namespace AzToolsFramework
             AZ::StringFunc::Path::Join(engineRoot, LoadingIconPath, iconPath);
             m_loadingMovie.setFileName(iconPath.c_str());
             m_loadingMovie.setCacheMode(QMovie::CacheMode::CacheAll);
-            m_loadingMovie.setScaledSize(QSize(m_thumbnailSize, m_thumbnailSize));
+            m_loadingMovie.setScaledSize(QSize(LoadingThumbnailSize, LoadingThumbnailSize));
             m_loadingMovie.start();
             m_pixmap = m_loadingMovie.currentPixmap();
             m_state = State::Ready;

Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/LoadingThumbnail.h

@@ -29,7 +29,7 @@ namespace AzToolsFramework
         {
             Q_OBJECT
         public:
-            explicit LoadingThumbnail(int thumbnailSize);
+            LoadingThumbnail();
             ~LoadingThumbnail() override;
 
             void UpdateTime(float /*deltaTime*/) override;

Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/MissingThumbnail.cpp

@@ -18,11 +18,11 @@ namespace AzToolsFramework
     {
         static const char* MISSING_ICON_PATH = "Editor/Icons/AssetBrowser/Default_16.svg";
 
-        MissingThumbnail::MissingThumbnail(int thumbnailSize)
-            : Thumbnail(MAKE_TKEY(ThumbnailKey), thumbnailSize)
+        MissingThumbnail::MissingThumbnail()
+            : Thumbnail(MAKE_TKEY(ThumbnailKey))
         {
-            m_icon = QIcon(MISSING_ICON_PATH);
-            m_state = State::Ready;
+            m_pixmap.load(MISSING_ICON_PATH);
+            m_state = m_pixmap.isNull() ? State::Failed : State::Ready;
         }
 
     } // namespace Thumbnailer

Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/MissingThumbnail.h

@@ -24,7 +24,7 @@ namespace AzToolsFramework
         {
             Q_OBJECT
         public:
-            explicit MissingThumbnail(int thumbnailSize);
+            MissingThumbnail();
         };
     } // namespace Thumbnailer
 } // namespace AzToolsFramework

Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/SourceControlThumbnail.cpp

@@ -69,8 +69,8 @@ namespace AzToolsFramework
 
         bool SourceControlThumbnail::m_readyForUpdate = true;
 
-        SourceControlThumbnail::SourceControlThumbnail(SharedThumbnailKey key, int thumbnailSize)
-            : Thumbnail(key, thumbnailSize)
+        SourceControlThumbnail::SourceControlThumbnail(SharedThumbnailKey key)
+            : Thumbnail(key)
         {
             const char* engineRoot = nullptr;
             AzFramework::ApplicationRequests::Bus::BroadcastResult(engineRoot, &AzFramework::ApplicationRequests::GetEngineRoot);
@@ -122,16 +122,16 @@ namespace AzToolsFramework
             {
                 if (fileInfo.HasFlag(AzToolsFramework::SCF_Writeable))
                 {
-                    m_icon = QIcon(m_writableIconPath.c_str());
+                    m_pixmap.load(m_writableIconPath.c_str());
                 }
                 else
                 {
-                    m_icon = QIcon(m_nonWritableIconPath.c_str());
+                    m_pixmap.load(m_nonWritableIconPath.c_str());
                 }
             }
             else
             {
-                m_icon = QIcon();
+                m_pixmap = QPixmap();
             }
             m_readyForUpdate = true;
             emit Updated();

Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/SourceControlThumbnail.h

@@ -55,7 +55,7 @@ namespace AzToolsFramework
         {
             Q_OBJECT
         public:
-            SourceControlThumbnail(SharedThumbnailKey key, int thumbnailSize);
+            SourceControlThumbnail(SharedThumbnailKey key);
             ~SourceControlThumbnail() override;
 
             //////////////////////////////////////////////////////////////////////////

Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/Thumbnail.cpp

@@ -24,8 +24,6 @@ namespace AzToolsFramework
 {
     namespace Thumbnailer
     {
-        static const int DefaultIconSize = 16;
-
         //////////////////////////////////////////////////////////////////////////
         // ThumbnailKey
         //////////////////////////////////////////////////////////////////////////
@@ -54,10 +52,9 @@ namespace AzToolsFramework
         //////////////////////////////////////////////////////////////////////////
         // Thumbnail
         //////////////////////////////////////////////////////////////////////////
-        Thumbnail::Thumbnail(SharedThumbnailKey key, int thumbnailSize)
+        Thumbnail::Thumbnail(SharedThumbnailKey key)
             : QObject()
             , m_state(State::Unloaded)
-            , m_thumbnailSize(thumbnailSize)
             , m_key(key)
         {
             connect(&m_watcher, &QFutureWatcher<void>::finished, this, [this]()
@@ -91,19 +88,9 @@ namespace AzToolsFramework
             }
         }
 
-        QPixmap Thumbnail::GetPixmap() const
+        const QPixmap& Thumbnail::GetPixmap() const
         {
-            return GetPixmap(QSize(DefaultIconSize, DefaultIconSize));
-        }
-
-        QPixmap Thumbnail::GetPixmap(const QSize& size) const
-        {
-            if (m_icon.isNull())
-            {
-                return m_pixmap;
-            }
-
-            return m_icon.pixmap(size);
+            return m_pixmap;
         }
 
         SharedThumbnailKey Thumbnail::GetKey() const

Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/Thumbnail.h

@@ -19,7 +19,6 @@ AZ_PUSH_DISABLE_WARNING(4127 4251 4800, "-Wunknown-warning-option") // 4127: con
                                                                     // 4800: 'int': forcing value to bool 'true' or 'false' (performance warning)
 #include <QObject>
 #include <QPixmap>
-#include <QIcon>
 #include <QFutureWatcher>
 AZ_POP_DISABLE_WARNING
 #endif
@@ -86,12 +85,11 @@ namespace AzToolsFramework
                 Failed
             };
 
-            Thumbnail(SharedThumbnailKey key, int thumbnailSize);
+            Thumbnail(SharedThumbnailKey key);
             ~Thumbnail() override;
             bool operator == (const Thumbnail& other) const;
             void Load();
-            virtual QPixmap GetPixmap() const;
-            virtual QPixmap GetPixmap(const QSize& size) const;
+            const QPixmap& GetPixmap() const;
             virtual void UpdateTime(float /*deltaTime*/) {}
             SharedThumbnailKey GetKey() const;
             State GetState() const;
@@ -105,10 +103,8 @@ namespace AzToolsFramework
         protected:
             QFutureWatcher<void> m_watcher;
             State m_state;
-            int m_thumbnailSize;
             SharedThumbnailKey m_key;
             QPixmap m_pixmap;
-            QIcon m_icon;
 
             virtual void LoadThread() {}
         };
@@ -122,7 +118,6 @@ namespace AzToolsFramework
             ThumbnailProvider() = default;
             virtual ~ThumbnailProvider() = default;
             virtual bool GetThumbnail(SharedThumbnailKey key, SharedThumbnail& thumbnail) = 0;
-            virtual void SetThumbnailSize(int thumbnailSize) = 0;
             //! Priority identifies ThumbnailProvider order in ThumbnailContext
             //! Higher priority means this ThumbnailProvider will take precedence in generating a thumbnail when
             //! a supplied ThumbnailKey is supported by multiple providers.
@@ -185,10 +180,7 @@ namespace AzToolsFramework
 
             bool GetThumbnail(SharedThumbnailKey key, SharedThumbnail& thumbnail) override;
 
-            void SetThumbnailSize(int thumbnailSize) override;
-
         protected:
-            int m_thumbnailSize;
             AZStd::unordered_map<SharedThumbnailKey, SharedThumbnail, Hasher, EqualKey> m_cache;
 
             //! Check if thumbnail key is handled by this provider, overload in derived class

Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/Thumbnail.inl

@@ -18,7 +18,6 @@ namespace AzToolsFramework
     {
         template <class ThumbnailType, class Hasher, class EqualKey>
         ThumbnailCache<ThumbnailType, Hasher, EqualKey>::ThumbnailCache()
-            : m_thumbnailSize(0)
         {
             BusConnect();
         }
@@ -49,17 +48,11 @@ namespace AzToolsFramework
             }
             if (IsSupportedThumbnail(key))
             {
-                thumbnail = QSharedPointer<ThumbnailType>(new ThumbnailType(key, m_thumbnailSize));
+                thumbnail = QSharedPointer<ThumbnailType>(new ThumbnailType(key));
                 m_cache[key] = thumbnail;
                 return true;
             }
             return false;
         }
-
-        template <class ThumbnailType, class Hasher, class EqualKey>
-        void ThumbnailCache<ThumbnailType, Hasher, EqualKey>::SetThumbnailSize(int thumbnailSize)
-        {
-            m_thumbnailSize = thumbnailSize;
-        }
     } // namespace Thumbnailer
 } // namespace AzToolsFramework

Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailContext.cpp

@@ -24,10 +24,9 @@ namespace AzToolsFramework
 {
     namespace Thumbnailer
     {
-        ThumbnailContext::ThumbnailContext(int thumbnailSize)
-            : m_missingThumbnail(new MissingThumbnail(thumbnailSize))
-            , m_loadingThumbnail(new LoadingThumbnail(thumbnailSize))
-            , m_thumbnailSize(thumbnailSize)
+        ThumbnailContext::ThumbnailContext()
+            : m_missingThumbnail(new MissingThumbnail())
+            , m_loadingThumbnail(new LoadingThumbnail())
             , m_threadPool(this)
         {
             ThumbnailContextRequestBus::Handler::BusConnect();
@@ -120,7 +119,6 @@ namespace AzToolsFramework
                 return;
             }
 
-            providerToAdd->SetThumbnailSize(m_thumbnailSize);
             m_providers.insert(providerToAdd);
         }
 

Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailContext.h

@@ -45,9 +45,9 @@ namespace AzToolsFramework
         {
             Q_OBJECT
         public:
-            AZ_CLASS_ALLOCATOR(ThumbnailContext, AZ::SystemAllocator, 0)
+            AZ_CLASS_ALLOCATOR(ThumbnailContext, AZ::SystemAllocator, 0);
 
-            explicit ThumbnailContext(int thumbnailSize);
+            ThumbnailContext();
             ~ThumbnailContext() override;
 
             //! Is the thumbnail currently loading or is about to load.
@@ -82,8 +82,6 @@ namespace AzToolsFramework
             SharedThumbnail m_missingThumbnail;
             //! Default loading thumbnail used when thumbnail is found by is not yet generated
             SharedThumbnail m_loadingThumbnail;
-            //! Thumbnail size (width and height in pixels)
-            int m_thumbnailSize;
             //! There is only a limited number of threads on global threadPool, because there can be many thumbnails rendering at once
             //! an individual threadPool is needed to avoid deadlocks
             QThreadPool m_threadPool;

Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerBus.h

@@ -40,7 +40,7 @@ namespace AzToolsFramework
         {
         public:
             //! Add thumbnail context
-            virtual void RegisterContext(const char* contextName, int thumbnailSize) = 0;
+            virtual void RegisterContext(const char* contextName) = 0;
 
             //! Remove thumbnail context and all associated ThumbnailProviders
             virtual void UnregisterContext(const char* contextName) = 0;

Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerComponent.cpp

@@ -32,8 +32,7 @@ namespace AzToolsFramework
 
         void ThumbnailerComponent::Activate()
         {
-            int thumbnailSize = qApp->style()->pixelMetric(QStyle::PM_SmallIconSize);
-            RegisterContext(ThumbnailContext::DefaultContext, thumbnailSize);
+            RegisterContext(ThumbnailContext::DefaultContext);
             BusConnect();
         }
 
@@ -62,10 +61,10 @@ namespace AzToolsFramework
             provided.push_back(AZ_CRC("ThumbnailerService", 0x65422b97));
         }
 
-        void ThumbnailerComponent::RegisterContext(const char* contextName, int thumbnailSize)
+        void ThumbnailerComponent::RegisterContext(const char* contextName)
         {
             AZ_Assert(m_thumbnails.find(contextName) == m_thumbnails.end(), "Context %s already registered", contextName);
-            m_thumbnails[contextName] = AZStd::make_shared<ThumbnailContext>(thumbnailSize);
+            m_thumbnails[contextName] = AZStd::make_shared<ThumbnailContext>();
         }
 
         void ThumbnailerComponent::UnregisterContext(const char* contextName)

Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerComponent.h

@@ -43,7 +43,7 @@ namespace AzToolsFramework
             //////////////////////////////////////////////////////////////////////////
             // ThumbnailerRequests
             //////////////////////////////////////////////////////////////////////////
-            void RegisterContext(const char* contextName, int thumbnailSize) override;
+            void RegisterContext(const char* contextName) override;
             void UnregisterContext(const char* contextName) override;
             bool HasContext(const char* contextName) const override;
             void RegisterThumbnailProvider(SharedThumbnailProvider provider, const char* contextName) override;

Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.cpp

@@ -286,12 +286,12 @@ namespace AzToolsFramework
         ComponentModeFramework::EditorComponentModeNotificationBus::Handler::BusConnect(
             GetEntityContextId());
         EditorEntityInfoNotificationBus::Handler::BusConnect();
-        AZ::Interface<EntityOutlinerWidgetInterface>::Register(this);
+        Prefab::PrefabPublicNotificationBus::Handler::BusConnect();
     }
 
     EntityOutlinerWidget::~EntityOutlinerWidget()
     {
-        AZ::Interface<EntityOutlinerWidgetInterface>::Unregister(this);
+        Prefab::PrefabPublicNotificationBus::Handler::BusDisconnect();
         ComponentModeFramework::EditorComponentModeNotificationBus::Handler::BusDisconnect();
         EditorEntityInfoNotificationBus::Handler::BusDisconnect();
         EditorPickModeNotificationBus::Handler::BusDisconnect();
@@ -1109,25 +1109,18 @@ namespace AzToolsFramework
         setEnabled(true);
         SetEntityOutlinerState(m_gui, true);
     }
-    
-    void EntityOutlinerWidget::SetUpdatesEnabled(bool enable)
+
+    void EntityOutlinerWidget::OnPrefabInstancePropagationBegin()
     {
-        if (enable)
-        {
-            QTimer::singleShot(1, this, [this]() {
-                m_gui->m_objectTree->setUpdatesEnabled(true);
-            });
-        }
-        else
-        {
-            m_gui->m_objectTree->setUpdatesEnabled(false);
-        }
+        m_gui->m_objectTree->setUpdatesEnabled(false);
     }
 
-    void EntityOutlinerWidget::ExpandEntityChildren(AZ::EntityId entityId)
+    void EntityOutlinerWidget::OnPrefabInstancePropagationEnd()
     {
-        QModelIndex index = GetIndexFromEntityId(entityId);
-        m_gui->m_objectTree->expand(index);
+        QTimer::singleShot(1, this, [this]() {
+            m_gui->m_objectTree->setUpdatesEnabled(true);
+            m_gui->m_objectTree->expand(m_proxyModel->index(0,0));
+        });
     }
 
     void EntityOutlinerWidget::OnEntityInfoUpdatedAddChildEnd(AZ::EntityId /*parentId*/, AZ::EntityId childId)

Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.hxx

@@ -20,10 +20,10 @@
 #include <AzToolsFramework/ComponentMode/EditorComponentModeBus.h>
 #include <AzToolsFramework/Entity/EditorEntityInfoBus.h>
 #include <AzToolsFramework/Entity/EditorEntityContextBus.h>
+#include <AzToolsFramework/Prefab/PrefabPublicNotificationBus.h>
 #include <AzToolsFramework/ToolsMessaging/EntityHighlightBus.h>
 #include <AzToolsFramework/UI/Outliner/EntityOutlinerCacheBus.h>
 #include <AzToolsFramework/UI/Outliner/EntityOutlinerSearchWidget.h>
-#include <AzToolsFramework/UI/Outliner/EntityOutlinerWidgetInterface.h>
 #include <AzToolsFramework/UI/SearchWidget/SearchWidgetTypes.hxx>
 
 #include <QIcon>
@@ -62,7 +62,7 @@ namespace AzToolsFramework
         , private EditorEntityContextNotificationBus::Handler
         , private EditorEntityInfoNotificationBus::Handler
         , private ComponentModeFramework::EditorComponentModeNotificationBus::Handler
-        , private EntityOutlinerWidgetInterface
+        , private Prefab::PrefabPublicNotificationBus::Handler
     {
         Q_OBJECT;
     public:
@@ -106,9 +106,9 @@ namespace AzToolsFramework
         void EnteredComponentMode(const AZStd::vector<AZ::Uuid>& componentModeTypes) override;
         void LeftComponentMode(const AZStd::vector<AZ::Uuid>& componentModeTypes) override;
 
-        // EntityOutlinerWidgetInterface
-        void SetUpdatesEnabled(bool enable) override;
-        void ExpandEntityChildren(AZ::EntityId entityId) override;
+        // PrefabPublicNotificationBus
+        void OnPrefabInstancePropagationBegin() override;
+        void OnPrefabInstancePropagationEnd() override;
 
         // Build a selection object from the given entities. Entities already in the Widget's selection buffers are ignored.
         template <class EntityIdCollection>

Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidgetInterface.h

@@ -1,30 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <AzCore/Interface/Interface.h>
-#include <AzCore/Serialization/SerializeContext.h>
-
-namespace AzToolsFramework
-{
-    class EntityOutlinerWidgetInterface
-    {
-    public:
-        AZ_RTTI(EntityOutlinerWidgetInterface, "{30C0F252-EC84-4196-BF59-EB9E73B8ADCB}");
-
-        virtual void SetUpdatesEnabled(bool enable) = 0;
-        virtual void ExpandEntityChildren(AZ::EntityId entityId) = 0;
-    };
-
-} // namespace AzToolsFramework
-

Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp

@@ -680,6 +680,13 @@ namespace AzToolsFramework
         AzQtComponents::BrowseEdit::removeDropTargetStyle(m_browseEdit);
     }
 
+    AssetSelectionModel PropertyAssetCtrl::GetAssetSelectionModel()
+    {
+        auto selectionModel = AssetSelectionModel::AssetTypeSelection(GetCurrentAssetType());
+        selectionModel.SetTitle(m_title);
+        return selectionModel;
+    }
+
     void PropertyAssetCtrl::UpdateTabOrder()
     {
         setTabOrder(m_browseEdit, m_editButton);
@@ -1058,6 +1065,11 @@ namespace AzToolsFramework
         m_editButton->setIcon(icon);
     }
 
+    void PropertyAssetCtrl::SetTitle(const QString& title)
+    {
+        m_title = title;
+    }
+
     void PropertyAssetCtrl::SetEditNotifyTarget(void* editNotifyTarget)
     {
         m_editNotifyTarget = editNotifyTarget;
@@ -1193,7 +1205,16 @@ namespace AzToolsFramework
     {
         (void)debugName;
 
-        if (attrib == AZ_CRC("EditCallback", 0xb74f2ee1))
+        if (attrib == AZ_CRC_CE("AssetPickerTitle"))
+        {
+            AZStd::string title;
+            attrValue->Read<AZStd::string>(title);
+            if (!title.empty())
+            {
+                GUI->SetTitle(title.c_str());
+            }
+        }
+        else if (attrib == AZ_CRC("EditCallback", 0xb74f2ee1))
         {
             PropertyAssetCtrl::EditCallbackType* func = azdynamic_cast<PropertyAssetCtrl::EditCallbackType*>(attrValue->GetAttribute());
             if (func)
@@ -1283,7 +1304,11 @@ namespace AzToolsFramework
         }
         else if (attrib == AZ_CRC_CE("Thumbnail"))
         {
-            GUI->SetShowThumbnail(true);
+            bool showThumbnail = false;
+            if (attrValue->Read<bool>(showThumbnail))
+            {
+                GUI->SetShowThumbnail(showThumbnail);
+            }
         }
         else if (attrib == AZ_CRC_CE("ThumbnailCallback"))
         {

Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.hxx

@@ -89,12 +89,13 @@ namespace AzToolsFramework
         void dragLeaveEvent(QDragLeaveEvent* event) override;
         void dropEvent(QDropEvent* event) override;
 
-        virtual AssetSelectionModel GetAssetSelectionModel() { return AssetSelectionModel::AssetTypeSelection(GetCurrentAssetType()); }
+        virtual AssetSelectionModel GetAssetSelectionModel();
 
     signals:
         void OnAssetIDChanged(AZ::Data::AssetId newAssetID);
 
     protected:
+        QString m_title;
         ThumbnailPropertyCtrl* m_thumbnail = nullptr;
         QPushButton* m_errorButton = nullptr;
         QToolButton* m_editButton = nullptr;
@@ -191,6 +192,7 @@ namespace AzToolsFramework
         //////////////////////////////////////////////////////////////////////////
 
     public slots:
+        void SetTitle(const QString& title);
         void SetEditNotifyTarget(void* editNotifyTarget);
         void SetEditNotifyCallback(EditCallbackType* editNotifyCallback); // This is meant to be used with the "EditCallback" Attribute
         void SetClearNotifyCallback(ClearCallbackType* clearNotifyCallback); // This is meant to be used with the "ClearNotify" Attribute

Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.cpp

@@ -114,6 +114,7 @@ namespace AzToolsFramework
             m_thumbnailEnlarged->move(position);
             m_thumbnailEnlarged->setWindowFlags(Qt::Window | Qt::FramelessWindowHint);
             m_thumbnailEnlarged->SetThumbnailKey(m_key);
+            m_thumbnailEnlarged->raise();
             m_thumbnailEnlarged->show();
         }
         QWidget::enterEvent(e);

Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake

@@ -652,6 +652,7 @@ set(FILES
     Prefab/PrefabPublicHandler.h
     Prefab/PrefabPublicHandler.cpp
     Prefab/PrefabPublicInterface.h
+    Prefab/PrefabPublicNotificationBus.h
     Prefab/PrefabUndo.h
     Prefab/PrefabUndo.cpp
     Prefab/PrefabUndoCache.cpp
@@ -687,7 +688,6 @@ set(FILES
     UI/Outliner/EntityOutlinerDisplayOptionsMenu.cpp
     UI/Outliner/EntityOutlinerTreeView.hxx
     UI/Outliner/EntityOutlinerTreeView.cpp
-    UI/Outliner/EntityOutlinerWidgetInterface.h
     UI/Outliner/EntityOutlinerWidget.hxx
     UI/Outliner/EntityOutlinerWidget.cpp
     UI/Outliner/EntityOutlinerCacheBus.h

Code/Framework/AzToolsFramework/Tests/ThumbnailerTests.cpp

@@ -85,8 +85,6 @@ namespace UnitTest
     {
         constexpr const char* contextName1 = "Context1";
         constexpr const char* contextName2 = "Context2";
-        constexpr int thumbnailSize1 = 128;
-        constexpr int thumbnailSize2 = 256;
 
         auto checkHasContext = [](const char* contextName)
         {
@@ -98,12 +96,12 @@ namespace UnitTest
         EXPECT_FALSE(checkHasContext(contextName1));
         EXPECT_FALSE(checkHasContext(contextName2));
 
-        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::RegisterContext, contextName1, thumbnailSize1);
+        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::RegisterContext, contextName1);
 
         EXPECT_TRUE(checkHasContext(contextName1));
         EXPECT_FALSE(checkHasContext(contextName2));
 
-        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::RegisterContext, contextName2, thumbnailSize2);
+        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::RegisterContext, contextName2);
 
         EXPECT_TRUE(checkHasContext(contextName1));
         EXPECT_TRUE(checkHasContext(contextName2));
@@ -123,8 +121,6 @@ namespace UnitTest
     {
         constexpr const char* contextName1 = "Context1";
         constexpr const char* contextName2 = "Context2";
-        constexpr int thumbnailSize1 = 128;
-        constexpr int thumbnailSize2 = 256;
 
         auto checkHasContext = [](const char* contextName)
         {
@@ -133,8 +129,8 @@ namespace UnitTest
             return hasContext;
         };
 
-        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::RegisterContext, contextName1, thumbnailSize1);
-        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::RegisterContext, contextName2, thumbnailSize2);
+        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::RegisterContext, contextName1);
+        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::RegisterContext, contextName2);
 
         EXPECT_TRUE(checkHasContext(contextName1));
         EXPECT_TRUE(checkHasContext(contextName2));
@@ -149,12 +145,11 @@ namespace UnitTest
     TEST_F(ThumbnailerTests, ThumbnailerComponent_RegisterContextTwice_Assert)
     {
         constexpr const char* contextName1 = "Context1";
-        constexpr int thumbnailSize1 = 128;
 
-        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::RegisterContext, contextName1, thumbnailSize1);
+        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::RegisterContext, contextName1);
 
         AZ_TEST_START_TRACE_SUPPRESSION;
-        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::RegisterContext, contextName1, thumbnailSize1);
+        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::RegisterContext, contextName1);
         AZ_TEST_STOP_TRACE_SUPPRESSION(1);
     }
 

Code/LauncherUnified/Launcher.cpp

@@ -26,7 +26,6 @@
 #include <AzGameFramework/Application/GameApplication.h>
 
 #include <CryLibrary.h>
-#include <IConsole.h>
 #include <ISystem.h>
 #include <ITimer.h>
 #include <LegacyAllocator.h>
@@ -46,6 +45,23 @@ extern "C" void CreateStaticModules(AZStd::vector<AZ::Module*>& modulesOut);
 
 namespace
 {
+    void ExecuteConsoleCommandFile(AzFramework::Application& application)
+    {
+        const AZStd::string_view customConCmdKey = "console-command-file";
+        const AZ::CommandLine* commandLine = application.GetCommandLine();
+        AZStd::size_t numSwitchValues = commandLine->GetNumSwitchValues(customConCmdKey);
+        if (numSwitchValues > 0)
+        {
+            // The expectations for command line parameters is that the "last one wins"
+            // That way it allows users and test scripts to override previous command line options by just listing them later on the invocation line
+            const AZStd::string& consoleCmd = commandLine->GetSwitchValue(customConCmdKey, numSwitchValues - 1);
+            if (!consoleCmd.empty())
+            {
+                AZ::Interface<AZ::IConsole>::Get()->ExecuteConfigFile(consoleCmd.c_str());
+            }
+        }
+    }
+
 #if AZ_TRAIT_LAUNCHER_USE_CRY_DYNAMIC_MODULE_HANDLE
     // mimics AZ::DynamicModuleHandle but uses CryLibrary under the hood,
     // which is necessary to properly load legacy Cry libraries on some platforms
@@ -637,7 +653,11 @@ namespace O3DELauncher
             if (gEnv && gEnv->pConsole)
             {
                 // Execute autoexec.cfg to load the initial level
-                gEnv->pConsole->ExecuteString("exec autoexec.cfg");
+                AZ::Interface<AZ::IConsole>::Get()->ExecuteConfigFile("autoexec.cfg");
+
+                // Find out if console command file was passed 
+                // via --console-command-file=%filename% and execute it
+                ExecuteConsoleCommandFile(gameApplication);
 
                 gEnv->pSystem->ExecuteCommandLine(false);
 

Code/Sandbox/Editor/CryEdit.cpp

@@ -149,7 +149,6 @@ AZ_POP_DISABLE_WARNING
 #include "LevelFileDialog.h"
 #include "LevelIndependentFileMan.h"
 #include "WelcomeScreen/WelcomeScreenDialog.h"
-#include "Dialogs/DuplicatedObjectsHandlerDlg.h"
 
 #include "Controls/ReflectedPropertyControl/PropertyCtrl.h"
 #include "Controls/ReflectedPropertyControl/ReflectedVar.h"
@@ -400,9 +399,7 @@ void CCryEditApp::RegisterActionHandlers()
     ON_COMMAND(ID_OBJECTMODIFY_UNFREEZE, OnObjectmodifyUnfreeze)
     ON_COMMAND(ID_UNDO, OnUndo)
     ON_COMMAND(ID_TOOLBAR_WIDGET_REDO, OnUndo)     // Can't use the same ID, because for the menu we can't have a QWidgetAction, while for the toolbar we want one
-    ON_COMMAND(ID_SELECTION_SAVE, OnSelectionSave)
     ON_COMMAND(ID_IMPORT_ASSET, OnOpenAssetImporter)
-    ON_COMMAND(ID_SELECTION_LOAD, OnSelectionLoad)
     ON_COMMAND(ID_LOCK_SELECTION, OnLockSelection)
     ON_COMMAND(ID_EDIT_LEVELDATA, OnEditLevelData)
     ON_COMMAND(ID_FILE_EDITLOGFILE, OnFileEditLogFile)
@@ -3019,149 +3016,12 @@ void CCryEditApp::OnFileExportOcclusionMesh()
     pExportManager->Export(levelName.toUtf8().data(), "ocm", levelPath.toUtf8().data(), false, false, true);
 }
 
-void CCryEditApp::OnSelectionSave()
-{
-    char szFilters[] = "Object Group Files (*.grp)";
-    QtUtil::QtMFCScopedHWNDCapture cap;
-    CAutoDirectoryRestoreFileDialog dlg(QFileDialog::AcceptSave, QFileDialog::AnyFile, "grp", {}, szFilters, {}, {}, cap);
-
-    if (dlg.exec())
-    {
-        QWaitCursor wait;
-        CSelectionGroup* sel = GetIEditor()->GetSelection();
-        //CXmlArchive xmlAr( "Objects" );
-
-
-        XmlNodeRef root = XmlHelpers::CreateXmlNode("Objects");
-        CObjectArchive ar(GetIEditor()->GetObjectManager(), root, false);
-        // Save all objects to XML.
-        for (int i = 0; i < sel->GetCount(); i++)
-        {
-            ar.SaveObject(sel->GetObject(i));
-        }
-        QString fileName = dlg.selectedFiles().first();
-        XmlHelpers::SaveXmlNode(GetIEditor()->GetFileUtil(), root, fileName.toStdString().c_str());
-        //xmlAr.Save( dlg.GetPathName() );
-    }
-}
-
 //////////////////////////////////////////////////////////////////////////
-struct SDuplicatedObject
-{
-    SDuplicatedObject(const QString& name, const GUID& id)
-    {
-        m_name = name;
-        m_id = id;
-    }
-    QString m_name;
-    GUID m_id;
-};
-
-void GatherAllObjects(XmlNodeRef node, std::vector<SDuplicatedObject>& outDuplicatedObjects)
-{
-    if (!azstricmp(node->getTag(), "Object"))
-    {
-        GUID guid;
-        if (node->getAttr("Id", guid))
-        {
-            if (GetIEditor()->GetObjectManager()->FindObject(guid))
-            {
-                QString name;
-                node->getAttr("Name", name);
-                outDuplicatedObjects.push_back(SDuplicatedObject(name, guid));
-            }
-        }
-    }
-
-    for (int i = 0, nChildCount(node->getChildCount()); i < nChildCount; ++i)
-    {
-        XmlNodeRef childNode = node->getChild(i);
-        if (childNode == NULL)
-        {
-            continue;
-        }
-        GatherAllObjects(childNode, outDuplicatedObjects);
-    }
-}
-
 void CCryEditApp::OnOpenAssetImporter()
 {
     QtViewPaneManager::instance()->OpenPane(LyViewPane::SceneSettings);
 }
 
-void CCryEditApp::OnSelectionLoad()
-{
-    // Load objects from .grp file.
-    QtUtil::QtMFCScopedHWNDCapture cap;
-    CAutoDirectoryRestoreFileDialog dlg(QFileDialog::AcceptOpen, QFileDialog::ExistingFile, "grp", {}, "Object Group Files (*.grp)", {}, {}, cap);
-    if (dlg.exec() != QDialog::Accepted)
-    {
-        return;
-    }
-
-    QWaitCursor wait;
-
-    XmlNodeRef root = XmlHelpers::LoadXmlFromFile(dlg.selectedFiles().first().toStdString().c_str());
-    if (!root)
-    {
-        QMessageBox::critical(AzToolsFramework::GetActiveWindow(), QString(), QObject::tr("Error at loading group file."));
-        return;
-    }
-
-    std::vector<SDuplicatedObject> duplicatedObjects;
-    GatherAllObjects(root, duplicatedObjects);
-
-    CDuplicatedObjectsHandlerDlg::EResult result(CDuplicatedObjectsHandlerDlg::eResult_None);
-    int nDuplicatedObjectSize(duplicatedObjects.size());
-
-    if (!duplicatedObjects.empty())
-    {
-        QString msg = QObject::tr("The following object(s) already exist(s) in the level.\r\n\r\n");
-
-        for (int i = 0; i < nDuplicatedObjectSize; ++i)
-        {
-            msg += QStringLiteral("\t");
-            msg += duplicatedObjects[i].m_name;
-            if (i < nDuplicatedObjectSize - 1)
-            {
-                msg += QStringLiteral("\r\n");
-            }
-        }
-
-        CDuplicatedObjectsHandlerDlg confirmDlg(msg);
-        if (confirmDlg.exec() == QDialog::Rejected)
-        {
-            return;
-        }
-        result = confirmDlg.GetResult();
-    }
-
-    CUndo undo("Load Objects");
-    GetIEditor()->ClearSelection();
-
-    CObjectArchive ar(GetIEditor()->GetObjectManager(), root, true);
-
-    if (result == CDuplicatedObjectsHandlerDlg::eResult_Override)
-    {
-        for (int i = 0; i < nDuplicatedObjectSize; ++i)
-        {
-            CBaseObject* pObj = GetIEditor()->GetObjectManager()->FindObject(duplicatedObjects[i].m_id);
-            if (pObj)
-            {
-                GetIEditor()->GetObjectManager()->DeleteObject(pObj);
-            }
-        }
-    }
-    else if (result == CDuplicatedObjectsHandlerDlg::eResult_CreateCopies)
-    {
-        ar.MakeNewIds(true);
-    }
-
-    GetIEditor()->GetObjectManager()->LoadObjects(ar, true);
-    GetIEditor()->SetModifiedFlag();
-    GetIEditor()->SetModifiedModule(eModifiedBrushes);
-}
-
 //////////////////////////////////////////////////////////////////////////
 void CCryEditApp::OnUpdateSelected(QAction* action)
 {

Code/Sandbox/Editor/CryEdit.h

@@ -232,9 +232,7 @@ public:
     void OnObjectmodifyFreeze();
     void OnObjectmodifyUnfreeze();
     void OnUndo();
-    void OnSelectionSave();
     void OnOpenAssetImporter();
-    void OnSelectionLoad();
     void OnUpdateSelected(QAction* action);
     void OnLockSelection();
     void OnEditLevelData();

Code/Sandbox/Editor/Dialogs/DuplicatedObjectsHandlerDlg.cpp

@@ -1,51 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "EditorDefs.h"
-
-#include "DuplicatedObjectsHandlerDlg.h"
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include <Dialogs/ui_DuplicatedObjectsHandlerDlg.h>
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-
-CDuplicatedObjectsHandlerDlg::CDuplicatedObjectsHandlerDlg(const QString& msg, QWidget* pParent)
-    : QDialog(pParent)
-    , m_ui(new Ui::DuplicatedObjectsHandlerDlg)
-{
-    m_ui->setupUi(this);
-    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
-    m_ui->textBrowser->setPlainText(msg);
-
-    connect(m_ui->buttonOverride, &QPushButton::clicked, this, &CDuplicatedObjectsHandlerDlg::OnBnClickedOverrideBtn);
-    connect(m_ui->buttonCreateCopies, &QPushButton::clicked, this, &CDuplicatedObjectsHandlerDlg::OnBnClickedCreateCopiesBtn);
-}
-
-CDuplicatedObjectsHandlerDlg::~CDuplicatedObjectsHandlerDlg()
-{
-}
-
-void CDuplicatedObjectsHandlerDlg::OnBnClickedOverrideBtn()
-{
-    m_result = eResult_Override;
-    accept();
-}
-
-void CDuplicatedObjectsHandlerDlg::OnBnClickedCreateCopiesBtn()
-{
-    m_result = eResult_CreateCopies;
-    accept();
-}
-
-#include <Dialogs/moc_DuplicatedObjectsHandlerDlg.cpp>

Code/Sandbox/Editor/Dialogs/DuplicatedObjectsHandlerDlg.h

@@ -1,57 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_EDITOR_DIALOGS_DUPLICATEDOBJECTSHANDLERDLG_H
-#define CRYINCLUDE_EDITOR_DIALOGS_DUPLICATEDOBJECTSHANDLERDLG_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QDialog>
-#endif
-
-namespace Ui
-{
-    class DuplicatedObjectsHandlerDlg;
-}
-
-class CDuplicatedObjectsHandlerDlg
-    : public QDialog
-{
-    Q_OBJECT
-public:
-    CDuplicatedObjectsHandlerDlg(const QString& msg, QWidget* pParent = nullptr);
-    virtual ~CDuplicatedObjectsHandlerDlg();
-
-    enum EResult
-    {
-        eResult_None,
-        eResult_Override,
-        eResult_CreateCopies
-    };
-
-    EResult GetResult() const
-    {
-        return m_result;
-    }
-
-protected:
-
-    EResult m_result;
-
-    void OnBnClickedOverrideBtn();
-    void OnBnClickedCreateCopiesBtn();
-
-    QScopedPointer<Ui::DuplicatedObjectsHandlerDlg> m_ui;
-};
-
-#endif // CRYINCLUDE_EDITOR_DIALOGS_DUPLICATEDOBJECTSHANDLERDLG_H

Code/Sandbox/Editor/Dialogs/DuplicatedObjectsHandlerDlg.ui

@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DuplicatedObjectsHandlerDlg</class>
- <widget class="QDialog" name="DuplicatedObjectsHandlerDlg">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>474</width>
-    <height>204</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Duplicated Objects Dialog</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QTextBrowser" name="textBrowser">
-     <property name="readOnly">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="pushButton">
-       <property name="text">
-        <string>Cancel</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="buttonOverride">
-       <property name="text">
-        <string>Override</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="buttonCreateCopies">
-       <property name="text">
-        <string>Create Copies</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections>
-  <connection>
-   <sender>pushButton</sender>
-   <signal>clicked()</signal>
-   <receiver>DuplicatedObjectsHandlerDlg</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>258</x>
-     <y>183</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>190</x>
-     <y>184</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>

Code/Sandbox/Editor/Dialogs/QT/NewEntityDialog.cpp

@@ -1,218 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "EditorDefs.h"
-
-#include "NewEntityDialog.h"
-
-// Qt
-#include <QPushButton>
-#include <QToolTip>
-#include <QMessageBox>
-
-// Editor
-#include "Dialogs/QT/ui_NewEntityDialog.h"
-
-
-NewEntityDialog::NewEntityDialog(QWidget* parent)
-    : QDialog(parent)
-    , ui(new Ui::NewEntityDialog)
-{
-    entityNameValidator = new EntityNameValidator(this);
-
-    ui->setupUi(this);
-
-    ui->entityName->setFocus();
-    ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
-    connect(ui->entityName, SIGNAL(textChanged(QString)), this, SLOT(ValidateInput()));
-    connect(ui->categoryName, SIGNAL(textChanged(QString)), this, SLOT(ValidateInput()));
-
-    SetCategoryCompleterPath((Path::GetEditingGameDataFolder() + "/Scripts/Entities").c_str());
-    SetNameValidatorPath((Path::GetEditingGameDataFolder() + "/Entities").c_str());
-}
-
-NewEntityDialog::~NewEntityDialog()
-{
-    SAFE_DELETE(entityNameValidator);
-    SAFE_DELETE(folderNameCompleter);
-    delete ui;
-}
-
-void NewEntityDialog::SetCategoryCompleterPath(CryStringT<char> path)
-{
-    SAFE_DELETE(folderNameCompleter);
-
-    QDirIterator directoryIt(QString::fromLocal8Bit(path.c_str(), path.length()), QDir::NoDotAndDotDot | QDir::AllDirs, QDirIterator::Subdirectories);
-    baseDir = directoryIt.path() + "/";
-
-    QStringList dirs;
-    while (directoryIt.hasNext())
-    {
-        QString dir = directoryIt.next().remove(baseDir);
-        dirs.append(dir);
-    }
-
-    folderNameCompleter = new QCompleter(dirs);
-    folderNameCompleter->setCompletionMode(QCompleter::UnfilteredPopupCompletion);
-    folderNameCompleter->setCaseSensitivity(Qt::CaseInsensitive);
-    ui->categoryName->setCompleter(folderNameCompleter);
-}
-
-void NewEntityDialog::SetNameValidatorPath(CryStringT<char> path)
-{
-    QDir dir(QString::fromLocal8Bit(path.c_str(), path.length()));
-    nameBaseDir = dir.path() + "/";
-}
-
-void NewEntityDialog::ValidateInput()
-{
-    int cursorPos = ui->entityName->cursorPosition();
-    QString text = ui->entityName->text();
-    bool validText = entityNameValidator->validate(text, cursorPos);
-    ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(validText);
-}
-
-void NewEntityDialog::accept()
-{
-    if (ui->categoryName->text().isEmpty()
-        && QMessageBox::question(this, "Are you sure?", "Create entity without category?", QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes)
-    {
-        return;
-    }
-    const char* devRoot = gEnv->pFileIO->GetAlias("@engroot@");
-    QString devRootPath(devRoot);
-    QFile entTemplateFile(devRootPath + "/Editor/NewEntityTemplate.ent_template");
-    QFile luaTemplateFile(devRootPath + "/Editor/NewEntityTemplate.lua_template");
-    QFile entDestFile(nameBaseDir + ui->entityName->text() + ".ent");
-    QFile luaDestFile(baseDir + ui->categoryName->text() + "/" + ui->entityName->text() + ".lua");
-
-    if (!entTemplateFile.exists() || !luaTemplateFile.exists())
-    {
-        QMessageBox::critical(this, tr("Missing Template Files"), tr("In order to create default entities the NewEntityTemplate.lua and NewEntityTemplate.ent template files must exist in the Templates folder!"));
-        return;
-    }
-
-    //generate the .ent file
-    QDir pathMaker(nameBaseDir);
-    pathMaker.mkpath(pathMaker.path());
-    QString entFileString;
-    if (!entTemplateFile.open(QIODevice::ReadOnly | QIODevice::Text))
-    {
-        AZ_Warning("Editor", false, "Enable to open template file for ent : %s", entTemplateFile.fileName().toUtf8().constData());
-        return;
-    }
-    else
-    {
-        entFileString = entTemplateFile.readAll();
-        entTemplateFile.close();
-    }
-
-    entFileString.replace(QString("[CATEGORY_NAME]"), ui->categoryName->text());
-    entFileString.replace(QString("[ENTITY_NAME]"), ui->entityName->text());
-    if (!entDestFile.open(QIODevice::WriteOnly | QIODevice::Text))
-    {
-        AZ_Warning("Editor", false, "Enable to open destination file for ent : %s", entDestFile.fileName().toUtf8().constData());
-        return;
-    }
-    else
-    {
-        entDestFile.write(entFileString.toUtf8());
-        entDestFile.close();
-    }
-
-    //generate the .lua file
-    pathMaker.setPath(baseDir);
-    pathMaker.mkpath(ui->categoryName->text() + "/");
-
-    QString luaFileString;
-    if (!luaTemplateFile.open(QIODevice::ReadOnly | QIODevice::Text))
-    {
-        AZ_Warning("Editor", false, "Enable to open template file for lua : %s", luaTemplateFile.fileName().toUtf8().constData());
-        return;
-    }
-    else
-    {
-        luaFileString = luaTemplateFile.readAll();
-        luaTemplateFile.close();
-    }
-
-    luaFileString.replace(QString("[ENTITY_NAME]"), ui->entityName->text());
-    if (!luaDestFile.open(QIODevice::WriteOnly | QIODevice::Text))
-    {
-        AZ_Warning("Editor", false, "Enable to open destination file for lua : %s", luaDestFile.fileName().toUtf8().constData());
-        return;
-    }
-    else
-    {
-        luaDestFile.write(luaFileString.toUtf8());
-        luaDestFile.close();
-    }
-
-
-    if (ui->openLuaCB->isChecked())
-    {
-        CFileUtil::EditTextFile(luaDestFile.fileName().toLocal8Bit().data());
-    }
-
-    QDialog::accept();
-}
-
-QValidator::State NewEntityDialog::EntityNameValidator::validate(QString& input, [[maybe_unused]] int& pos) const
-{
-    if (!m_Parent)
-    {
-        return Invalid;
-    }
-
-    if (input.isEmpty())
-    {
-        return Invalid;
-    }
-
-    if (input.contains("/"))
-    {
-        return Invalid;
-    }
-
-    QString fileBaseName = m_Parent->ui->entityName->text();
-
-    // Characters
-    const char* notAllowedChars = ",^@=+{}[]~!?:&*\"|#%<>$\"'();`' ";
-    for (const char* c = notAllowedChars; *c; c++)
-    {
-        if (fileBaseName.contains(QLatin1Char(*c)))
-        {
-            const QChar qc = QLatin1Char(*c);
-            if (qc.isSpace())
-            {
-                QToolTip::showText(m_Parent->ui->entityName->mapToGlobal(QPoint()), tr("Name may not contain white space."), m_Parent->ui->entityName, m_Parent->ui->entityName->rect(), 2000);
-            }
-            else
-            {
-                QToolTip::showText(m_Parent->ui->entityName->mapToGlobal(QPoint()), tr("Invalid character \"%1\".").arg(qc), m_Parent->ui->entityName, m_Parent->ui->entityName->rect(), 2000);
-            }
-            return Invalid;
-        }
-    }
-
-    QString filename(m_Parent->nameBaseDir + m_Parent->ui->entityName->text() + ".ent");
-    QFile newFile(filename);
-
-    if (newFile.exists())
-    {
-        QToolTip::showText(m_Parent->ui->entityName->mapToGlobal(QPoint()), tr("Filename already exists!"), m_Parent->ui->entityName, m_Parent->ui->entityName->rect(), 2000);
-        return Invalid;
-    }
-
-    return Acceptable;
-}
-
-#include <Dialogs/QT/moc_NewEntityDialog.cpp>

Code/Sandbox/Editor/Dialogs/QT/NewEntityDialog.h

@@ -1,69 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#ifndef NEWENTITYDIALOG_H
-#define NEWENTITYDIALOG_H
-
-#if !defined(Q_MOC_RUN)
-#include <QDialog>
-#include <QCompleter>
-#include <QDirIterator>
-#include <QStringListModel>
-#include <QValidator>
-#include <QEvent>
-#include <QLineEdit>
-#endif
-
-namespace Ui {
-    class NewEntityDialog;
-}
-
-class NewEntityDialog
-    : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit NewEntityDialog(QWidget* parent = 0);
-    ~NewEntityDialog();
-
-private:
-    Ui::NewEntityDialog* ui;
-    QString baseDir = "";
-    QString nameBaseDir = "";
-    QCompleter* folderNameCompleter = NULL;
-
-    void SetCategoryCompleterPath(CryStringT<char> path);
-    void SetNameValidatorPath(CryStringT<char> path);
-
-    virtual void accept();
-
-    class EntityNameValidator
-        : public QValidator
-    {
-    public:
-        explicit EntityNameValidator(NewEntityDialog* parent = 0)
-            : QValidator(parent)
-            , m_Parent(parent)
-        {
-        }
-        virtual State validate(QString& input, int& pos) const;
-
-        NewEntityDialog* m_Parent;
-    };
-
-    EntityNameValidator* entityNameValidator;
-
-public slots:
-    void ValidateInput();
-};
-
-#endif // NEWENTITYDIALOG_H

Code/Sandbox/Editor/Dialogs/QT/NewEntityDialog.ui

@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>NewEntityDialog</class>
- <widget class="QDialog" name="NewEntityDialog">
-  <property name="windowModality">
-   <enum>Qt::WindowModal</enum>
-  </property>
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>111</height>
-   </rect>
-  </property>
-  <property name="contextMenuPolicy">
-   <enum>Qt::PreventContextMenu</enum>
-  </property>
-  <property name="windowTitle">
-   <string>New Entity</string>
-  </property>
-  <property name="sizeGripEnabled">
-   <bool>false</bool>
-  </property>
-  <property name="modal">
-   <bool>false</bool>
-  </property>
-  <widget class="QDialogButtonBox" name="buttonBox">
-   <property name="geometry">
-    <rect>
-     <x>30</x>
-     <y>70</y>
-     <width>341</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="orientation">
-    <enum>Qt::Horizontal</enum>
-   </property>
-   <property name="standardButtons">
-    <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="entityName">
-   <property name="geometry">
-    <rect>
-     <x>110</x>
-     <y>10</y>
-     <width>281</width>
-     <height>20</height>
-    </rect>
-   </property>
-  </widget>
-  <widget class="QLabel" name="label">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>10</y>
-     <width>71</width>
-     <height>16</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <weight>75</weight>
-     <bold>true</bold>
-    </font>
-   </property>
-   <property name="text">
-    <string>Entity Name:</string>
-   </property>
-   <property name="buddy">
-    <cstring>entityName</cstring>
-   </property>
-  </widget>
-  <widget class="QLabel" name="label_2">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>40</y>
-     <width>91</width>
-     <height>16</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <weight>75</weight>
-     <bold>true</bold>
-    </font>
-   </property>
-   <property name="text">
-    <string>Entity Category:</string>
-   </property>
-   <property name="buddy">
-    <cstring>categoryName</cstring>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="categoryName">
-   <property name="geometry">
-    <rect>
-     <x>110</x>
-     <y>40</y>
-     <width>281</width>
-     <height>20</height>
-    </rect>
-   </property>
-  </widget>
-  <widget class="QCheckBox" name="openLuaCB">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>80</y>
-     <width>141</width>
-     <height>17</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>Open Lua After Creating</string>
-   </property>
-  </widget>
- </widget>
- <tabstops>
-  <tabstop>entityName</tabstop>
-  <tabstop>categoryName</tabstop>
- </tabstops>
- <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>NewEntityDialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>248</x>
-     <y>254</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>NewEntityDialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>316</x>
-     <y>260</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>

Code/Sandbox/Editor/EditorViewportWidget.cpp

@@ -1509,10 +1509,10 @@ bool EditorViewportWidget::AddCameraMenuItems(QMenu* menu)
     }
 
     action = customCameraMenu->addAction(tr("Look through entity"));
-    AzToolsFramework::EntityIdList selectedEntityList;
-    AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(selectedEntityList, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
-    action->setCheckable(selectedEntityList.size() > 0 || m_viewSourceType == ViewSourceType::AZ_Entity);
-    action->setEnabled(selectedEntityList.size() > 0 || m_viewSourceType == ViewSourceType::AZ_Entity);
+    bool areAnyEntitiesSelected = false;
+    AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(areAnyEntitiesSelected, &AzToolsFramework::ToolsApplicationRequests::AreAnyEntitiesSelected);
+    action->setCheckable(areAnyEntitiesSelected || m_viewSourceType == ViewSourceType::AZ_Entity);
+    action->setEnabled(areAnyEntitiesSelected || m_viewSourceType == ViewSourceType::AZ_Entity);
     action->setChecked(m_viewSourceType == ViewSourceType::AZ_Entity);
     connect(action, &QAction::triggered, this, [this](bool isChecked)
         {

Code/Sandbox/Editor/EditorViewportWidget.h

@@ -234,11 +234,8 @@ public:
     QPoint ViewportToWidget(const QPoint& point) const;
     QSize WidgetToViewport(const QSize& size) const;
 
-    /// Take raw input and create a final mouse interaction.
-    /// @attention Do not map **point** from widget to viewport explicitly,
-    /// this is handled internally by BuildMouseInteraction - just pass directly.
     AzToolsFramework::ViewportInteraction::MouseInteraction BuildMouseInteraction(
-        Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, const QPoint& point);
+        Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, const QPoint& point) override;
 
     void SetPlayerPos()
     {

Code/Sandbox/Editor/GameExporter.cpp

@@ -33,7 +33,6 @@
 #include "Util/CryMemFile.h"
 #include "Objects/ObjectManager.h"
 
-#include "Objects/ObjectPhysicsManager.h"
 #include "Objects/EntityObject.h"
 #include "LensFlareEditor/LensFlareManager.h"
 #include "LensFlareEditor/LensFlareLibrary.h"
@@ -192,14 +191,6 @@ bool CGameExporter::Export(unsigned int flags, [[maybe_unused]] EEndian eExportE
             }
         }
 
-        ////////////////////////////////////////////////////////////////////////
-        // Inform all objects that an export is about to begin
-        ////////////////////////////////////////////////////////////////////////
-        if (exportSuccessful)
-        {
-            GetIEditor()->GetObjectManager()->GetPhysicsManager()->PrepareForExport();
-        }
-
         ////////////////////////////////////////////////////////////////////////
         // Export all data to the game
         ////////////////////////////////////////////////////////////////////////
@@ -519,8 +510,6 @@ void CGameExporter::ExportMapInfo(XmlNodeRef& node)
     CXmlArchive xmlAr;
     xmlAr.bLoading = false;
     xmlAr.root = node;
-
-    GetIEditor()->GetObjectManager()->GetPhysicsManager()->SerializeCollisionClasses(xmlAr);
 }
 
 //////////////////////////////////////////////////////////////////////////

Code/Sandbox/Editor/Include/IObjectManager.h

@@ -24,7 +24,6 @@ class CUsedResources;
 class CSelectionGroup;
 class CObjectClassDesc;
 class CObjectArchive;
-class CObjectPhysicsManager;
 class CViewport;
 struct HitContext;
 enum class ImageRotationDegrees;
@@ -247,10 +246,6 @@ public:
 
     virtual IGizmoManager* GetGizmoManager() = 0;
 
-    //////////////////////////////////////////////////////////////////////////
-    //! Get acess to object physics manager
-    virtual CObjectPhysicsManager* GetPhysicsManager() = 0;
-
     //////////////////////////////////////////////////////////////////////////
     //! Invalidate visibily settings of objects.
     virtual void InvalidateVisibleList() = 0;

Code/Sandbox/Editor/MainWindow.cpp

@@ -756,6 +756,7 @@ void MainWindow::InitActions()
     am->AddAction(ID_TOOLBAR_WIDGET_SNAP_GRID, QString());
     am->AddAction(ID_TOOLBAR_WIDGET_ENVIRONMENT_MODE, QString());
     am->AddAction(ID_TOOLBAR_WIDGET_DEBUG_MODE, QString());
+    am->AddAction(ID_TOOLBAR_WIDGET_SPACER_RIGHT, QString());
 
     // File actions
     am->AddAction(ID_FILE_NEW, tr("New Level"))
@@ -1170,14 +1171,17 @@ void MainWindow::InitActions()
     am->AddAction(ID_AUDIO_REFRESH_AUDIO_SYSTEM, tr("Refresh Audio"))
         .Connect(&QAction::triggered, this, &MainWindow::OnRefreshAudioSystem);
 
-    // Fame actions
+    // Game actions
     am->AddAction(ID_VIEW_SWITCHTOGAME, tr("Play &Game"))
+        .SetIcon(QIcon(":/stylesheet/img/UI20/toolbar/Play.svg"))
         .SetShortcut(tr("Ctrl+G"))
         .SetToolTip(tr("Play Game (Ctrl+G)"))
         .SetStatusTip(tr("Activate the game input mode"))
         .SetApplyHoverEffect()
         .SetCheckable(true)
         .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdatePlayGame);
+    am->AddAction(ID_TOOLBAR_WIDGET_PLAYCONSOLE_LABEL, tr("Play Console"))
+        .SetText(tr("Play Console"));
     am->AddAction(ID_SWITCH_PHYSICS, tr("Simulate"))
         .SetShortcut(tr("Ctrl+P"))
         .SetToolTip(tr("Simulate (Ctrl+P)"))
@@ -1489,6 +1493,14 @@ QToolButton* MainWindow::CreateDebugModeButton()
     return debugModeButton;
 }
 
+QWidget* MainWindow::CreateSpacerRightWidget()
+{
+    QWidget* spacer = new QWidget();
+    spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+    spacer->setVisible(true);
+    return spacer;
+}
+
 void MainWindow::InitEnvironmentModeMenu(CVarMenu* environmentModeMenu)
 {
     environmentModeMenu->clear();
@@ -2395,6 +2407,9 @@ QWidget* MainWindow::CreateToolbarWidget(int actionId)
     case ID_TOOLBAR_WIDGET_DEBUG_MODE:
         w = CreateDebugModeButton();
         break;
+    case ID_TOOLBAR_WIDGET_SPACER_RIGHT:
+        w = CreateSpacerRightWidget();
+        break; 
     default:
         qWarning() << Q_FUNC_INFO << "Unknown id " << actionId;
         return nullptr;

Code/Sandbox/Editor/MainWindow.h

@@ -215,6 +215,7 @@ private:
 
     QWidget* CreateSnapToGridWidget();
     QWidget* CreateSnapToAngleWidget();
+    QWidget* CreateSpacerRightWidget();
 
     QToolButton* CreateUndoRedoButton(int command);
 

Code/Sandbox/Editor/Objects/ObjectManager.cpp

@@ -25,7 +25,6 @@
 #include "Viewport.h"
 #include "GizmoManager.h"
 #include "AxisGizmo.h"
-#include "ObjectPhysicsManager.h"
 #include "GameEngine.h"
 #include "WaitProgress.h"
 #include "Util/Image.h"
@@ -109,7 +108,6 @@ CObjectManager::CObjectManager()
     , m_pLoadProgress(nullptr)
     , m_loadedObjects(0)
     , m_totalObjectsToLoad(0)
-    , m_pPhysicsManager(new CObjectPhysicsManager())
     , m_bExiting(false)
     , m_isUpdateVisibilityList(false)
     , m_currentHideCount(CBaseObject::s_invalidHiddenID)
@@ -138,7 +136,6 @@ CObjectManager::~CObjectManager()
     DeleteAllObjects();
 
     delete m_gizmoManager;
-    delete m_pPhysicsManager;
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -841,8 +838,6 @@ void CObjectManager::Update()
     {
         prevActiveWindow->setFocus();
     }
-
-    m_pPhysicsManager->Update();
 }
 
 //////////////////////////////////////////////////////////////////////////

Code/Sandbox/Editor/Objects/ObjectManager.h

@@ -334,9 +334,6 @@ public:
     virtual void FindAndRenameProperty2(const char* property2Name, const QString& oldValue, const QString& newValue);
     virtual void FindAndRenameProperty2If(const char* property2Name, const QString& oldValue, const QString& newValue, const char* otherProperty2Name, const QString& otherValue);
 
-    class CObjectPhysicsManager* GetPhysicsManager()
-    { return m_pPhysicsManager; }
-
     bool IsReloading() const { return m_bInReloading; }
     void SetSkipUpdate(bool bSkipUpdate) override { m_bSkipObjectUpdate = bSkipUpdate; }
 
@@ -433,8 +430,6 @@ private:
     int m_totalObjectsToLoad;
     //////////////////////////////////////////////////////////////////////////
 
-    class CObjectPhysicsManager* m_pPhysicsManager;
-
     //////////////////////////////////////////////////////////////////////////
     // Numbering for names.
     //////////////////////////////////////////////////////////////////////////

Code/Sandbox/Editor/Objects/ObjectPhysicsManager.cpp

@@ -1,191 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "EditorDefs.h"
-
-#include "ObjectPhysicsManager.h"
-
-// Editor
-#include "GameEngine.h"
-#include "Commands/CommandManager.h"
-#include "Objects/SelectionGroup.h"
-#include "Include/IObjectManager.h"
-
-#include "CryPhysicsDeprecation.h"
-
-#define MAX_OBJECTS_PHYS_SIMULATION_TIME (5)
-
-//////////////////////////////////////////////////////////////////////////
-CObjectPhysicsManager::CObjectPhysicsManager()
-{
-    CommandManagerHelper::RegisterCommand(GetIEditor()->GetCommandManager(),
-        "physics", "simulate_objects", "", "",
-        AZStd::bind(&CObjectPhysicsManager::Command_SimulateObjects, this));
-    CommandManagerHelper::RegisterCommand(GetIEditor()->GetCommandManager(),
-        "physics", "reset_objects_state", "", "",
-        AZStd::bind(&CObjectPhysicsManager::Command_ResetPhysicsState, this));
-    CommandManagerHelper::RegisterCommand(GetIEditor()->GetCommandManager(),
-        "physics", "get_objects_state", "", "",
-        AZStd::bind(&CObjectPhysicsManager::Command_GetPhysicsState, this));
-
-    m_fStartObjectSimulationTime = 0;
-    m_bSimulatingObjects = false;
-    m_wasSimObjects = 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CObjectPhysicsManager::~CObjectPhysicsManager()
-{
-
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectPhysicsManager::Command_SimulateObjects()
-{
-    SimulateSelectedObjectsPositions();
-}
-
-/////////////////////////////////////////////////////////////////////////
-void CObjectPhysicsManager::Command_ResetPhysicsState()
-{
-    CSelectionGroup* pSelection = GetIEditor()->GetSelection();
-    for (int i = 0; i < pSelection->GetCount(); i++)
-    {
-        pSelection->GetObject(i)->OnEvent(EVENT_PHYSICS_RESETSTATE);
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////
-void CObjectPhysicsManager::Command_GetPhysicsState()
-{
-    CSelectionGroup* pSelection = GetIEditor()->GetSelection();
-    for (int i = 0; i < pSelection->GetCount(); i++)
-    {
-        pSelection->GetObject(i)->OnEvent(EVENT_PHYSICS_GETSTATE);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectPhysicsManager::Update()
-{
-    if (m_bSimulatingObjects)
-    {
-        UpdateSimulatingObjects();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectPhysicsManager::SimulateSelectedObjectsPositions()
-{
-    CSelectionGroup* pSel = GetIEditor()->GetObjectManager()->GetSelection();
-    if (pSel->IsEmpty())
-    {
-        return;
-    }
-
-    if (GetIEditor()->GetGameEngine()->GetSimulationMode())
-    {
-        return;
-    }
-
-    GetIEditor()->GetGameEngine()->SetSimulationMode(true, true);
-
-    m_simObjects.clear();
-    CRY_PHYSICS_REPLACEMENT_ASSERT();
-    m_wasSimObjects = m_simObjects.size();
-
-    m_fStartObjectSimulationTime = GetISystem()->GetITimer()->GetAsyncCurTime();
-    m_bSimulatingObjects = true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectPhysicsManager::UpdateSimulatingObjects()
-{
-    {
-        CUndo undo("Simulate");
-        CRY_PHYSICS_REPLACEMENT_ASSERT();
-    }
-
-    float curTime = GetISystem()->GetITimer()->GetAsyncCurTime();
-    float runningTime = (curTime - m_fStartObjectSimulationTime);
-
-    if (m_simObjects.empty() || (runningTime > MAX_OBJECTS_PHYS_SIMULATION_TIME))
-    {
-        m_fStartObjectSimulationTime = 0;
-        m_bSimulatingObjects = false;
-        GetIEditor()->GetGameEngine()->SetSimulationMode(false, true);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectPhysicsManager::PrepareForExport()
-{
-    // Clear the collision class set, ready for objects to register
-    // their collision classes
-    m_collisionClasses.clear();
-    m_collisionClassExportId = 0;
-    // First collision-class IS always the default one
-    RegisterCollisionClass(SCollisionClass(0, 0));
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool operator == (const SCollisionClass& lhs, const SCollisionClass& rhs)
-{
-    return lhs.type == rhs.type && lhs.ignore == rhs.ignore;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CObjectPhysicsManager::RegisterCollisionClass(const SCollisionClass& collclass)
-{
-    TCollisionClassVector::iterator it = std::find(m_collisionClasses.begin(), m_collisionClasses.end(), collclass);
-    if (it == m_collisionClasses.end())
-    {
-        m_collisionClasses.push_back(collclass);
-        return m_collisionClasses.size() - 1;
-    }
-    return it - m_collisionClasses.begin();
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CObjectPhysicsManager::GetCollisionClassId(const SCollisionClass& collclass)
-{
-    TCollisionClassVector::iterator it = std::find(m_collisionClasses.begin(), m_collisionClasses.end(), collclass);
-    if (it == m_collisionClasses.end())
-    {
-        return 0;
-    }
-    return it - m_collisionClasses.begin();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectPhysicsManager::SerializeCollisionClasses(CXmlArchive& xmlAr)
-{
-    if (!xmlAr.bLoading)
-    {
-        // Storing
-        CLogFile::WriteLine("Storing Collision Classes ...");
-
-        XmlNodeRef root = xmlAr.root->newChild("CollisionClasses");
-        int count = m_collisionClasses.size();
-        for (int i = 0; i < count; i++)
-        {
-            SCollisionClass& cc = m_collisionClasses[i];
-            XmlNodeRef xmlCC = root->newChild("CollisionClass");
-            xmlCC->setAttr("type", cc.type);
-            xmlCC->setAttr("ignore", cc.ignore);
-        }
-    }
-}
-
-
-

Code/Sandbox/Editor/Objects/ObjectPhysicsManager.h

@@ -1,56 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_EDITOR_OBJECTS_OBJECTPHYSICSMANAGER_H
-#define CRYINCLUDE_EDITOR_OBJECTS_OBJECTPHYSICSMANAGER_H
-#pragma once
-
-
-//////////////////////////////////////////////////////////////////////////
-class CObjectPhysicsManager
-{
-public:
-    CObjectPhysicsManager();
-    ~CObjectPhysicsManager();
-
-    void SimulateSelectedObjectsPositions();
-    void Update();
-
-    //////////////////////////////////////////////////////////////////////////
-    /// Collision Classes
-    //////////////////////////////////////////////////////////////////////////
-    int RegisterCollisionClass(const SCollisionClass& collclass);
-    int GetCollisionClassId(const SCollisionClass& collclass);
-    void SerializeCollisionClasses(CXmlArchive& xmlAr);
-
-    void PrepareForExport();
-
-private:
-    void Command_SimulateObjects();
-    void Command_GetPhysicsState();
-    void Command_ResetPhysicsState();
-
-    void UpdateSimulatingObjects();
-
-    bool m_bSimulatingObjects;
-    float m_fStartObjectSimulationTime;
-    int m_wasSimObjects;
-    std::vector<_smart_ptr<CBaseObject> > m_simObjects;
-
-    typedef std::vector<SCollisionClass> TCollisionClassVector;
-    int m_collisionClassExportId;
-    TCollisionClassVector m_collisionClasses;
-};
-
-
-#endif // CRYINCLUDE_EDITOR_OBJECTS_OBJECTPHYSICSMANAGER_H

Code/Sandbox/Editor/RenderViewport.h

@@ -238,11 +238,8 @@ public:
     QPoint ViewportToWidget(const QPoint& point) const;
     QSize WidgetToViewport(const QSize& size) const;
 
-    /// Take raw input and create a final mouse interaction.
-    /// @attention Do not map **point** from widget to viewport explicitly,
-    /// this is handled internally by BuildMouseInteraction - just pass directly.
     AzToolsFramework::ViewportInteraction::MouseInteraction BuildMouseInteraction(
-        Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, const QPoint& point);
+        Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, const QPoint& point) override;
 
     void SetPlayerPos()
     {

Code/Sandbox/Editor/Resource.h

@@ -149,8 +149,6 @@
 #define ID_OBJECTMODIFY_UNFREEZE                   33518
 #define ID_UNDO                                    33524
 #define ID_EDIT_CLONE                              33525
-#define ID_SELECTION_SAVE                          33527
-#define ID_SELECTION_LOAD                          33529
 #define ID_GOTO_SELECTED                           33535
 #define ID_EDIT_LEVELDATA                          33542
 #define ID_FILE_EDITEDITORINI                      33543
@@ -397,4 +395,6 @@
 #define ID_TOOLBAR_WIDGET_SNAP_GRID          50008
 #define ID_TOOLBAR_WIDGET_ENVIRONMENT_MODE   50011
 #define ID_TOOLBAR_WIDGET_DEBUG_MODE         50012
+#define ID_TOOLBAR_WIDGET_SPACER_RIGHT       50013
+#define ID_TOOLBAR_WIDGET_PLAYCONSOLE_LABEL  50014
 #define ID_TOOLBAR_WIDGET_LAST               50020

Code/Sandbox/Editor/ToolbarManager.cpp

@@ -511,6 +511,7 @@ void ToolbarManager::InitializeStandardToolbars()
         m_standardToolbars.reserve(5 + macroToolbars.size());
         m_standardToolbars.push_back(GetEditModeToolbar());
         m_standardToolbars.push_back(GetObjectToolbar());
+        m_standardToolbars.push_back(GetPlayConsoleToolbar());
 
         IPlugin* pGamePlugin = GetIEditor()->GetPluginManager()->GetPluginByGUID("{71CED8AB-54E2-4739-AA78-7590A5DC5AEB}");
         IPlugin* pDescriptionEditorPlugin = GetIEditor()->GetPluginManager()->GetPluginByGUID("{4B9B7074-2D58-4AFD-BBE1-BE469D48456A}");
@@ -591,8 +592,6 @@ AmazonToolbar ToolbarManager::GetEditModeToolbar() const
     t.AddAction(ID_EDITMODE_ROTATE, ORIGINAL_TOOLBAR_VERSION);
     t.AddAction(ID_EDITMODE_SCALE, ORIGINAL_TOOLBAR_VERSION);
 
-    t.AddAction(ID_VIEW_SWITCHTOGAME, TOOLBARS_WITH_PLAY_GAME);
-
     t.AddAction(ID_TOOLBAR_SEPARATOR, ORIGINAL_TOOLBAR_VERSION);
     t.AddAction(ID_TOOLBAR_WIDGET_SNAP_GRID, ORIGINAL_TOOLBAR_VERSION);
     t.AddAction(ID_TOOLBAR_WIDGET_SNAP_ANGLE, ORIGINAL_TOOLBAR_VERSION);
@@ -622,6 +621,18 @@ AmazonToolbar ToolbarManager::GetObjectToolbar() const
     return t;
 }
 
+AmazonToolbar ToolbarManager::GetPlayConsoleToolbar() const
+{
+    AmazonToolbar t = AmazonToolbar("PlayConsole", QObject::tr("Play Console"));
+    t.SetMainToolbar(true);
+
+    t.AddAction(ID_TOOLBAR_WIDGET_SPACER_RIGHT, ORIGINAL_TOOLBAR_VERSION); 
+    t.AddAction(ID_TOOLBAR_SEPARATOR, ORIGINAL_TOOLBAR_VERSION);
+    t.AddAction(ID_TOOLBAR_WIDGET_PLAYCONSOLE_LABEL, ORIGINAL_TOOLBAR_VERSION);
+    t.AddAction(ID_VIEW_SWITCHTOGAME, TOOLBARS_WITH_PLAY_GAME);
+    return t;
+}
+
 AmazonToolbar ToolbarManager::GetEditorsToolbar() const
 {
     AmazonToolbar t = AmazonToolbar("Editors", QObject::tr("Editors Toolbar"));
@@ -753,7 +764,7 @@ void ToolbarManager::InstantiateToolbars()
     for (int i = 0; i < numToolbars; ++i)
     {
         InstantiateToolbar(i);
-        if (i == 1)
+        if (i == 2)
         {
             // Hack. Just copying how it was
             m_mainWindow->addToolBarBreak();

Code/Sandbox/Editor/ToolbarManager.h

@@ -167,6 +167,7 @@ public:
     AmazonToolbar GetObjectToolbar() const;
     AmazonToolbar GetEditorsToolbar() const;
     AmazonToolbar GetMiscToolbar() const;
+    AmazonToolbar GetPlayConsoleToolbar() const;
 
 private:
     Q_DISABLE_COPY(ToolbarManager);

Code/Sandbox/Editor/TrackView/TrackViewDialog.cpp

@@ -807,18 +807,11 @@ void CTrackViewDialog::UpdateActions()
         m_actions[ID_TRACKVIEW_MUTE_ALL]->setEnabled(true);
         m_actions[ID_ADDSCENETRACK]->setEnabled(true);
 
-        AzToolsFramework::EntityIdList entityIds;
-        AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(
-            entityIds, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
+        bool areAnyEntitiesSelected = false;
+        AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(
+            areAnyEntitiesSelected, &AzToolsFramework::ToolsApplicationRequests::AreAnyEntitiesSelected);
 
-        if (entityIds.empty())
-        {
-            m_actions[ID_ADDNODE]->setEnabled(false);
-        }
-        else
-        {
-            m_actions[ID_ADDNODE]->setEnabled(true);
-        }
+        m_actions[ID_ADDNODE]->setEnabled(areAnyEntitiesSelected);
     }
     else
     {
@@ -1569,12 +1562,12 @@ void CTrackViewDialog::OnAddSelectedNode()
             sequence->MarkAsModified();
         }
 
-        AzToolsFramework::EntityIdList entityIds;
-        AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(
-            entityIds, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
+        int selectedEntitiesCount = 0;
+        AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(
+            selectedEntitiesCount, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntitiesCount);
 
         // check to make sure all nodes were added and notify user if they weren't
-        if (addedNodes.GetCount() != entityIds.size())
+        if (addedNodes.GetCount() != selectedEntitiesCount)
         {
             IMovieSystem* movieSystem = GetIEditor()->GetMovieSystem();
 

Code/Sandbox/Editor/TrackView/TrackViewNodes.cpp

@@ -1137,12 +1137,12 @@ void CTrackViewNodesCtrl::OnNMRclick(QPoint point)
                 CTrackViewAnimNodeBundle addedNodes = groupNode->AddSelectedEntities(m_pTrackViewDialog->GetDefaultTracksForEntityNode());
                 undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
 
-                AzToolsFramework::EntityIdList entityIds;
-                AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(
-                    entityIds, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
+                int selectedEntitiesCount = 0;
+                AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(
+                    selectedEntitiesCount, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntitiesCount);
 
                 // check to make sure all nodes were added and notify user if they weren't
-                if (addedNodes.GetCount() != entityIds.size())
+                if (addedNodes.GetCount() != selectedEntitiesCount)
                 {
                     IMovieSystem* movieSystem = GetIEditor()->GetMovieSystem();
 

Code/Sandbox/Editor/ViewPane.cpp

@@ -589,7 +589,7 @@ void CLayoutViewPane::ShowTitleMenu()
     action->setChecked(IsFullscreen());
 
     action = root.addAction(tr("Configure Layout..."));
-    if (AZ::Interface<AzFramework::AtomActiveInterface>::Get())
+    if (!CViewManager::IsMultiViewportEnabled())
     {
         action->setDisabled(true);
     }

Code/Sandbox/Editor/Viewport.cpp

@@ -21,6 +21,9 @@
 // AzQtComponents
 #include <AzQtComponents/DragAndDrop/ViewportDragAndDrop.h>
 
+#include <AzToolsFramework/API/ComponentEntitySelectionBus.h>
+#include <AzToolsFramework/ViewportSelection/EditorSelectionUtil.h>
+
 // Editor
 #include "ViewManager.h"
 #include "Include/ITransformManipulator.h"
@@ -1091,6 +1094,13 @@ void QtViewport::SetAxisConstrain(int axis)
     m_activeAxis = axis;
 };
 
+AzToolsFramework::ViewportInteraction::MouseInteraction QtViewport::BuildMouseInteraction(
+    [[maybe_unused]] Qt::MouseButtons buttons, [[maybe_unused]] Qt::KeyboardModifiers modifiers, [[maybe_unused]] const QPoint& point)
+{
+    // Implemented by sub-class
+    return AzToolsFramework::ViewportInteraction::MouseInteraction();
+}
+
 //////////////////////////////////////////////////////////////////////////
 bool QtViewport::HitTest(const QPoint& point, HitContext& hitInfo)
 {
@@ -1103,7 +1113,51 @@ bool QtViewport::HitTest(const QPoint& point, HitContext& hitInfo)
         hitInfo.bUseSelectionHelpers = true;
     }
 
-    return GetIEditor()->GetObjectManager()->HitTest(hitInfo);
+    const int viewportId = GetViewportId();
+
+    AzToolsFramework::EntityIdList visibleEntityIds;
+    AzToolsFramework::ViewportInteraction::MainEditorViewportInteractionRequestBus::Event(
+        viewportId,
+        &AzToolsFramework::ViewportInteraction::MainEditorViewportInteractionRequests::FindVisibleEntities,
+        visibleEntityIds);
+
+    // Look through all visible entities to find the closest one to the specified mouse point
+    using namespace AzToolsFramework::ViewportInteraction;
+    AZ::EntityId entityIdUnderCursor;
+    float closestDistance = std::numeric_limits<float>::max();
+    MouseInteraction mouseInteraction = BuildMouseInteraction(QGuiApplication::mouseButtons(),
+        QGuiApplication::queryKeyboardModifiers(),
+        point);
+    for (auto entityId : visibleEntityIds)
+    {
+        using AzFramework::ViewportInfo;
+        // Check if components provide an aabb
+        if (const AZ::Aabb aabb = AzToolsFramework::CalculateEditorEntitySelectionBounds(entityId, ViewportInfo{ viewportId });
+            aabb.IsValid())
+        {
+            // Coarse grain check
+            if (AzToolsFramework::AabbIntersectMouseRay(mouseInteraction, aabb))
+            {
+                // If success, pick against specific component
+                if (AzToolsFramework::PickEntity(
+                    entityId, mouseInteraction,
+                    closestDistance, viewportId))
+                {
+                    entityIdUnderCursor = entityId;
+                }
+            }
+        }
+    }
+
+    // If we hit a valid Entity, then store the distance in the HitContext
+    // so that the caller can use this for calculations
+    if (entityIdUnderCursor.IsValid())
+    {
+        hitInfo.dist = closestDistance;
+        return true;
+    }
+
+    return false;
 }
 
 //////////////////////////////////////////////////////////////////////////

Code/Sandbox/Editor/Viewport.h

@@ -17,6 +17,7 @@
 #pragma once
 
 #if !defined(Q_MOC_RUN)
+#include <AzToolsFramework/Viewport/ViewportTypes.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiManager.h>
 #include <Cry_Color.h>
 #include "IPostRenderer.h"
@@ -405,6 +406,12 @@ public:
 
     void SetAxisConstrain(int axis);
 
+    /// Take raw input and create a final mouse interaction.
+    /// @attention Do not map **point** from widget to viewport explicitly,
+    /// this is handled internally by BuildMouseInteraction - just pass directly.
+    virtual AzToolsFramework::ViewportInteraction::MouseInteraction BuildMouseInteraction(
+        Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, const QPoint& point);
+
     //////////////////////////////////////////////////////////////////////////
     // Selection.
     //////////////////////////////////////////////////////////////////////////

Code/Sandbox/Editor/editor_lib_files.cmake

@@ -511,9 +511,6 @@ set(FILES
     DimensionsDialog.cpp
     DimensionsDialog.h
     DimensionsDialog.ui
-    Dialogs/QT/NewEntityDialog.cpp
-    Dialogs/QT/NewEntityDialog.h
-    Dialogs/QT/NewEntityDialog.ui
     NewLevelDialog.cpp
     NewLevelDialog.h
     NewLevelDialog.ui
@@ -551,7 +548,6 @@ set(FILES
     DatabaseFrameWnd.h
     DatabaseFrameWnd.ui
     DatabaseFrameWnd.qrc
-    Dialogs/DuplicatedObjectsHandlerDlg.h
     DocMultiArchive.h
     EditMode/DeepSelection.h
     FBXExporterDialog.h
@@ -638,8 +634,6 @@ set(FILES
     Objects/ObjectManager.h
     Objects/ObjectManagerLegacyUndo.cpp
     Objects/ObjectManagerLegacyUndo.h
-    Objects/ObjectPhysicsManager.cpp
-    Objects/ObjectPhysicsManager.h
     Objects/DisplayContext.cpp
     Objects/DisplayContext.h
     Objects/EntityObject.cpp
@@ -713,8 +707,6 @@ set(FILES
     graphicssettingsdialog.ui
     AboutDialog.cpp
     DatabaseFrameWnd.cpp
-    Dialogs/DuplicatedObjectsHandlerDlg.cpp
-    Dialogs/DuplicatedObjectsHandlerDlg.ui
     ErrorReportTableModel.h
     ErrorReportTableModel.cpp
     EditMode/DeepSelection.cpp

Code/Tools/AssetProcessor/native/unittests/ConnectionUnitTests.cpp

@@ -44,7 +44,4 @@ ConnectionUnitTest::~ConnectionUnitTest()
 
 }
 
-
-
-REGISTER_UNIT_TEST(ConnectionUnitTest)
-
+// REGISTER_UNIT_TEST(ConnectionUnitTest) // disabling due to intermittent test failure - LYN-3368

Code/Tools/Standalone/Source/ThumbnailerNullComponent.cpp

@@ -20,10 +20,8 @@ namespace LUAEditor
 {
     namespace Thumbnailer
     {
-        const int DEFAULT_THUMBNAIL_SIZE = 100;
-
         ThumbnailerNullComponent::ThumbnailerNullComponent() :
-            m_nullThumbnail(new AzToolsFramework::Thumbnailer::MissingThumbnail(DEFAULT_THUMBNAIL_SIZE))
+            m_nullThumbnail(new AzToolsFramework::Thumbnailer::MissingThumbnail())
         {
         }
 
@@ -53,7 +51,7 @@ namespace LUAEditor
             services.push_back(AZ_CRC("ThumbnailerService", 0x65422b97));
         }
 
-        void ThumbnailerNullComponent::RegisterContext(const char* /*contextName*/, int /*thumbnailSize*/)
+        void ThumbnailerNullComponent::RegisterContext(const char* /*contextName*/)
         {
         }
 

Code/Tools/Standalone/Source/ThumbnailerNullComponent.h

@@ -42,7 +42,7 @@ namespace LUAEditor
             //////////////////////////////////////////////////////////////////////////
             // ThumbnailerRequests
             //////////////////////////////////////////////////////////////////////////
-            void RegisterContext(const char* contextName, int thumbnailSize) override;
+            void RegisterContext(const char* contextName) override;
             void UnregisterContext(const char* contextName) override;
             bool HasContext(const char* contextName) const override;
             void RegisterThumbnailProvider(AzToolsFramework::Thumbnailer::SharedThumbnailProvider provider, const char* contextName) override;