Remove CinemachineDebugDisplay

com.unity.cinemachine/Runtime/Behaviours/CinemachineBrain.cs

@@ -164,7 +164,6 @@ public LensModeOverrideSettings LensModeOverride
 
 #if CINEMACHINE_UIELEMENTS && UNITY_EDITOR
         DebugText m_DebugText;
-        CinemachineDebugDisplay m_DebugDisplay;
 #endif
 
         void OnValidate()
@@ -224,8 +223,6 @@ void OnDisable()
             CinemachineDebug.OnGUIHandlers -= OnGuiHandler;
             m_DebugText?.Dispose();
             m_DebugText = null;
-            if (m_DebugDisplay != null)
-                m_DebugDisplay.enabled = false;
 #endif
             s_ActiveBrains.Remove(this);
 
@@ -247,33 +244,6 @@ void OnSceneUnloaded(Scene scene)
                 ManualUpdate();
         }
 
-#if UNITY_EDITOR && CINEMACHINE_UIELEMENTS
-        void Update()
-        {
-            if (ShowDebugText || CinemachineDebug.GameViewGuidesEnabled)
-            {
-                // Make sure we have a CinemachineDebugDisplay component
-                if (m_DebugDisplay == null && !TryGetComponent(out m_DebugDisplay))
-                {
-                    m_DebugDisplay = gameObject.AddComponent<CinemachineDebugDisplay>();
-                    m_DebugDisplay.hideFlags = HideFlags.DontSave | HideFlags.HideInInspector;
-                }
-                m_DebugDisplay.enabled = true;
-            }
-            else if (m_DebugDisplay != null)
-            {
-                // Get rid of the CinemachineDebugDisplay component, so no OnGUI calls are made
-                RuntimeUtility.DestroyObject(m_DebugDisplay);
-                m_DebugDisplay = null;
-            }
-            if (!ShowDebugText && m_DebugText != null)
-            {
-                m_DebugText.Dispose();
-                m_DebugText = null;
-            }
-       }
-#endif
-
         void LateUpdate()
         {
             if (UpdateMethod != UpdateMethods.ManualUpdate)
@@ -307,8 +277,24 @@ void OnPreCull()
         }
 
     #if CINEMACHINE_UIELEMENTS
+
+        void OnGUI()
+        {
+            if ((ShowDebugText || CinemachineDebug.GameViewGuidesEnabled)
+                 && CinemachineDebug.OnGUIHandlers != null && Event.current.type != EventType.Layout)
+            {
+                CinemachineDebug.OnGUIHandlers(this);
+            }
+        }
+
         void OnGuiHandler(CinemachineBrain brain)
         {
+            if (!ShowDebugText && m_DebugText != null)
+            {
+                m_DebugText.Dispose();
+                m_DebugText = null;
+            }
+
             if (!ShowDebugText || brain != this)
                 return;
 

com.unity.cinemachine/Runtime/Debug/CinemachineDebug.cs

@@ -118,7 +118,7 @@ static void PositionWithinCameraView(VisualElement viewportContainer, Camera cam
 
         /// <summary>
         /// Delegate for OnGUI debugging.  
-        /// This will be called by the CinemachineDebugDisplay in its OnGUI (editor only)
+        /// This will be called by the CinemachineDebugBrain in its OnGUI (editor only)
         /// </summary>
         public static Action<CinemachineBrain> OnGUIHandlers;