Integrating up through commit 90f050496

Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorNonUniformScaleComponent.cpp

@@ -67,10 +67,7 @@ namespace AzToolsFramework
             incompatible.push_back(AZ_CRC_CE("LookAtService"));
             incompatible.push_back(AZ_CRC_CE("SequenceService"));
             incompatible.push_back(AZ_CRC_CE("ClothMeshService"));
-            incompatible.push_back(AZ_CRC_CE("PhysXColliderService"));
-            incompatible.push_back(AZ_CRC_CE("PhysXTriggerService"));
             incompatible.push_back(AZ_CRC_CE("PhysXJointService"));
-            incompatible.push_back(AZ_CRC_CE("PhysXShapeColliderService"));
             incompatible.push_back(AZ_CRC_CE("PhysXCharacterControllerService"));
             incompatible.push_back(AZ_CRC_CE("PhysXRagdollService"));
             incompatible.push_back(AZ_CRC_CE("WhiteBoxService"));

Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ScriptEditorComponent.h

@@ -35,6 +35,7 @@ namespace AzToolsFramework
         public:
             AZ_EDITOR_COMPONENT(ScriptEditorComponent, "{b5fc8679-fa2a-4c7c-ac42-dcc279ea613a}")
 
+            static void Reflect(AZ::ReflectContext* context);
             static bool DoComponentsMatch(const ScriptEditorComponent* thisComponent, const ScriptEditorComponent* otherComponent);
 
             ScriptEditorComponent() = default;
@@ -79,8 +80,6 @@ namespace AzToolsFramework
                 float m_sortOrder; // Sort order of the property as defined by using the "order" attribute, by default the order is FLT_MAX which means alphabetical sort will be used
             };
 
-            static void Reflect(AZ::ReflectContext* context);
-
             void LoadProperties();
             // make sure internal script (m_scriptComponent.m_script) is set before loading
             void LoadScript();

Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ToolsAssetCatalogComponent.cpp

@@ -196,7 +196,6 @@ namespace AssetProcessor
         AZ_UNUSED(autoRegisterIfNotFound);
         AZ_Assert(autoRegisterIfNotFound == false, "Auto registration is invalid during asset processing.");
         AZ_UNUSED(typeToRegister);
-        AZ_Assert(typeToRegister == AZ::Data::s_invalidAssetType, "Can not register types during asset processing.");
 
         AzFramework::SocketConnection* engineConnection = AzFramework::SocketConnection::GetInstance();
         if (!engineConnection || !engineConnection->IsConnected())

Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.cpp

@@ -23,9 +23,11 @@
 #include <AzCore/RTTI/BehaviorContext.h>
 #include <AzCore/Serialization/EditContext.h>
 #include <AzCore/Serialization/SerializeContext.h>
+#include <AzFramework/API/ApplicationAPI.h>
 #include <AzFramework/Components/TransformComponent.h>
 #include <AzToolsFramework/API/ToolsApplicationAPI.h>
 #include <AzToolsFramework/Entity/EditorEntityContextBus.h>
+#include <AzToolsFramework/Prefab/PrefabPublicInterface.h>
 #include <AzToolsFramework/ToolsComponents/TransformComponentBus.h>
 #include <AzToolsFramework/ToolsComponents/TransformScalePropertyHandler.h>
 #include <AzToolsFramework/ViewportSelection/EditorSelectionUtil.h>
@@ -1054,11 +1056,32 @@ namespace AzToolsFramework
 
         AZ::u32 TransformComponent::ParentChanged()
         {
+            AZ::u32 refreshLevel = AZ::Edit::PropertyRefreshLevels::None;
+
+            if (!m_parentEntityId.IsValid())
+            {
+                // If Prefabs are enabled, reroute the invalid id to the level root
+                bool isPrefabSystemEnabled = false;
+                AzFramework::ApplicationRequests::Bus::BroadcastResult(
+                    isPrefabSystemEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
+
+                if (isPrefabSystemEnabled)
+                {
+                    auto prefabPublicInterface = AZ::Interface<Prefab::PrefabPublicInterface>::Get();
+
+                    if (prefabPublicInterface)
+                    {
+                        m_parentEntityId = prefabPublicInterface->GetLevelInstanceContainerEntityId();
+                        refreshLevel = AZ::Edit::PropertyRefreshLevels::ValuesOnly;
+                    }
+                }
+            }
+
             auto parentId = m_parentEntityId;
             m_parentEntityId = m_previousParentEntityId;
             SetParent(parentId);
 
-            return AZ::Edit::PropertyRefreshLevels::None;
+            return refreshLevel;
         }
 
         AZ::u32 TransformComponent::TransformChanged()