Merge remote-tracking branch 'origin' into MultiplayerComponents

2021-05-05 20:07:49 -07:00
parent a1fe8fe419 724add6365
commit 751d13dd7b
773 changed files with 5555 additions and 37483 deletions
@@ -34,6 +34,8 @@ class ITexture;

 namespace AzFramework
 {
+    inline constexpr AZ::s32 g_defaultSceneEntityDebugDisplayId = AZ_CRC_CE("MainViewportEntityDebugDisplayId"); // default id to draw to all viewports in the default scene
+
    /// DebugDisplayRequests provides a debug draw api to be used by components and viewport features.
    class DebugDisplayRequests
        : public AZ::EBusTraits