Merge branch 'main' into ly-as-sdk/LYN-2948

Code/Sandbox/Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.cpp

@@ -137,8 +137,20 @@ namespace AzAssetBrowserRequestHandlerPrivate
                     entityName = AZStd::string::format("Entity%d", GetIEditor()->GetObjectManager()->GetObjectCount());
                 }
 
-                AZ::Entity* newEntity = aznew AZ::Entity(entityName.c_str());
-                EditorEntityContextRequestBus::Broadcast(&EditorEntityContextRequests::AddRequiredComponents, *newEntity);
+                AZ::EntityId targetEntityId;
+                EditorRequests::Bus::BroadcastResult(targetEntityId, &EditorRequests::CreateNewEntityAtPosition, worldTransform.GetTranslation(), AZ::EntityId());
+
+                AZ::Entity* newEntity = nullptr;
+                AZ::ComponentApplicationBus::BroadcastResult(newEntity, &AZ::ComponentApplicationRequests::FindEntity, targetEntityId);
+
+                if (newEntity == nullptr)
+                {
+                    return;
+                }
+
+                newEntity->SetName(entityName);
+
+                newEntity->Deactivate();
 
                 // Create component.
                 AZ::Component* newComponent = newEntity->CreateComponent(componentTypeId);
@@ -151,15 +163,7 @@ namespace AzAssetBrowserRequestHandlerPrivate
                     newEntity->AddComponent(newComponent);
                 }
 
-                //  Set entity position.
-                auto* transformComponent = newEntity->FindComponent<Components::TransformComponent>();
-                if (transformComponent)
-                {
-                    transformComponent->SetWorldTM(worldTransform);
-                }
-
-                // Add the entity to the editor context, which activates it and creates the sandbox object.
-                EditorEntityContextRequestBus::Broadcast(&EditorEntityContextRequests::AddEditorEntity, newEntity);
+                newEntity->Activate();
 
                 // set asset after components have been activated in AddEditorEntity method
                 if (newComponent)

Code/Sandbox/Editor/RenderViewport.h

@@ -200,6 +200,7 @@ public:
     {
         return {};
     }
+    float DeviceScalingFactor() override { return 1.0f; }
 
     // AzToolsFramework::ViewportFreezeRequestBus
     bool IsViewportInputFrozen() override;