Merge branch 'main' into Prefab/RelativePathForNewPrefabs

Code/Framework/AzFramework/AzFramework/Asset/AssetCatalog.cpp

@@ -617,9 +617,9 @@ namespace AzFramework
             // won't free the mutex until the load is complete.
             // So instead, queue the notification until the next tick, so that it doesn't occur within the AssetCatalogRequestBus mutex, and also
             // so that the entire AssetCatalog initialization is complete.
-            AZ::TickBus::QueueFunction([catalogRegistryFile]()
+            AZ::TickBus::QueueFunction([catalogRegistryString = AZStd::string(catalogRegistryFile)]()
                 {
-                    AssetCatalogEventBus::Broadcast(&AssetCatalogEventBus::Events::OnCatalogLoaded, catalogRegistryFile);
+                    AssetCatalogEventBus::Broadcast(&AssetCatalogEventBus::Events::OnCatalogLoaded, catalogRegistryString.c_str());
                 });
         }
     }

Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/EditorContextMenu.cpp

@@ -65,7 +65,7 @@ namespace AzToolsFramework
 
                 if (!contextMenu.m_menu->isEmpty())
                 {
-                    contextMenu.m_menu->popup(QCursor::pos());
+                    contextMenu.m_menu->exec(QCursor::pos());
                 }
             }
         }

Code/LauncherUnified/Platform/iOS/O3DEApplicationDelegate_iOS.mm

@@ -39,15 +39,15 @@ namespace
 }
 
 
-@interface LumberyardApplicationDelegate_iOS : NSObject<UIApplicationDelegate>
+@interface O3DEApplicationDelegate_iOS : NSObject<UIApplicationDelegate>
 {
 }
-@end    // LumberyardApplicationDelegate_iOS Interface
+@end    // O3DEApplicationDelegate_iOS Interface
 
-@implementation LumberyardApplicationDelegate_iOS
+@implementation O3DEApplicationDelegate_iOS
 
 
-- (int)runLumberyardApplication
+- (int)runO3DEApplication
 {
 #if AZ_TESTS_ENABLED
 
@@ -55,7 +55,7 @@ namespace
     return static_cast<int>(ReturnCode::ErrUnitTestNotSupported);
 
 #else
-    using namespace LumberyardLauncher;
+    using namespace O3DELauncher;
 
     PlatformMainInfo mainInfo;
     mainInfo.m_updateResourceLimits = IncreaseResourceLimits;
@@ -79,19 +79,19 @@ namespace
 #endif // AZ_TESTS_ENABLED
 }
 
-- (void)launchLumberyardApplication
+- (void)launchO3DEApplication
 {
-    const int exitCode = [self runLumberyardApplication];
+    const int exitCode = [self runO3DEApplication];
     exit(exitCode);
 }
 
 - (BOOL)application:(UIApplication*)application didFinishLaunchingWithOptions:(NSDictionary*)launchOptions
 {
-    // prevent the lumberyard runtime from running when launched in a xctest environment, otherwise the
+    // prevent the o3de runtime from running when launched in a xctest environment, otherwise the
     // testing framework will kill the "app" due to the lengthy bootstrap process
     if ([[NSProcessInfo processInfo] environment][@"XCTestConfigurationFilePath"] == nil)
     {
-        [self performSelector:@selector(launchLumberyardApplication) withObject:nil afterDelay:0.0];
+        [self performSelector:@selector(launchO3DEApplication) withObject:nil afterDelay:0.0];
     }
     return YES;
 }
@@ -132,4 +132,4 @@ namespace
         &AzFramework::IosLifecycleEvents::Bus::Events::OnDidReceiveMemoryWarning);
 }
 
-@end // LumberyardApplicationDelegate_iOS Implementation
+@end // O3DEApplicationDelegate_iOS Implementation

Code/LauncherUnified/Platform/iOS/O3DEApplication_iOS.mm

@@ -16,12 +16,12 @@
 #include <AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Platform.h>
 
 
-@interface LumberyardApplication_iOS : UIApplication
+@interface O3DEApplication_iOS : UIApplication
 {
 }
-@end    // LumberyardApplication_iOS Interface
+@end    // O3DEApplication_iOS Interface
 
-@implementation LumberyardApplication_iOS
+@implementation O3DEApplication_iOS
 
 - (void)touchesBegan: (NSSet<UITouch*>*)touches withEvent: (UIEvent*)event
 {
@@ -65,4 +65,4 @@
     [self touchesEnded: touches withEvent: event];
 }
 
-@end // LumberyardApplication_iOS Implementation
+@end // O3DEApplication_iOS Implementation

Code/LauncherUnified/Platform/iOS/platform_ios_files.cmake

@@ -13,8 +13,8 @@ set(FILES
     Launcher_iOS.mm
     Launcher_Traits_iOS.h
     Launcher_Traits_Platform.h
-    LumberyardApplication_iOS.mm
-    LumberyardApplicationDelegate_iOS.mm
+    O3DEApplication_iOS.mm
+    O3DEApplicationDelegate_iOS.mm
     ../Common/Apple/Launcher_Apple.mm
     ../Common/Apple/Launcher_Apple.h
     ../Common/UnixLike/Launcher_UnixLike.cpp

Code/Sandbox/Editor/LegacyViewportCameraController.cpp

@@ -342,7 +342,6 @@ bool LegacyViewportCameraControllerInstance::HandleInputChannelEvent(const AzFra
                 m_inRotateMode = true;
             }
 
-            shouldConsumeEvent = true;
             shouldCaptureCursor = true;
         }
         else if (state == InputChannel::State::Ended)

Code/Sandbox/Editor/ViewManager.cpp

@@ -37,7 +37,7 @@
 #include <AzFramework/API/AtomActiveInterface.h>
 #include <AzCore/Console/IConsole.h>
 
-AZ_CVAR(bool, ed_useAtomNativeViewport, false, nullptr, AZ::ConsoleFunctorFlags::Null, "Use the new Atom-native Editor viewport (experimental, not yet stable");
+AZ_CVAR(bool, ed_useAtomNativeViewport, true, nullptr, AZ::ConsoleFunctorFlags::Null, "Use the new Atom-native Editor viewport (experimental, not yet stable");
 
 bool CViewManager::IsMultiViewportEnabled()
 {

Code/Sandbox/Editor/ViewportManipulatorController.cpp

@@ -21,8 +21,8 @@
 
 #include <QApplication>
 
-static const auto ManipulatorPriority = AzFramework::ViewportControllerPriority::Highest;
-static const auto InteractionPriority = AzFramework::ViewportControllerPriority::High;
+static const auto ManipulatorPriority = AzFramework::ViewportControllerPriority::High;
+static const auto InteractionPriority = AzFramework::ViewportControllerPriority::Low;
 
 namespace SandboxEditor
 {