From 6597e40e9d831a4cf448df02bfc29eb87498adba Mon Sep 17 00:00:00 2001
From: Anonymous <none@gmail.com>
Date: Tue, 16 Dec 2025 17:36:55 +0100
Subject: [PATCH] Fix some leaked managed shell (#1095)

---
 .../InteractionModes/InteractionModeManager.cs      | 11 +++++++++++
 .../BoundsControl/BoundsCalculator.cs               |  2 ++
 .../Interop/UGUIInputAdapter.cs                     | 13 +++++++++++++
 3 files changed, 26 insertions(+)

diff --git a/org.mixedrealitytoolkit.input/InteractionModes/InteractionModeManager.cs b/org.mixedrealitytoolkit.input/InteractionModes/InteractionModeManager.cs
index 292502186..be1684de1 100644
--- a/org.mixedrealitytoolkit.input/InteractionModes/InteractionModeManager.cs
+++ b/org.mixedrealitytoolkit.input/InteractionModes/InteractionModeManager.cs
@@ -319,6 +319,17 @@ private void Awake()
             InitializeInteractionModeDetectors();
         }
 
+        /// <summary>
+        /// A Unity event function that is called when the script component has been destroyed.
+        /// </summary>
+        private void OnDestroy()
+        {
+            if (InteractionManager != null)
+            {
+                InteractionManager.interactorRegistered -= OnInteractorRegistered;
+            }
+        }
+
         /// <summary>
         /// A Unity Editor only event function that is called when the script is loaded or a value changes in the Unity Inspector.
         /// </summary>
diff --git a/org.mixedrealitytoolkit.spatialmanipulation/BoundsControl/BoundsCalculator.cs b/org.mixedrealitytoolkit.spatialmanipulation/BoundsControl/BoundsCalculator.cs
index f23d1eed2..10e1b700a 100644
--- a/org.mixedrealitytoolkit.spatialmanipulation/BoundsControl/BoundsCalculator.cs
+++ b/org.mixedrealitytoolkit.spatialmanipulation/BoundsControl/BoundsCalculator.cs
@@ -100,6 +100,8 @@ internal static Bounds CalculateBounds(
                 finalBounds.Encapsulate(root.InverseTransformPoint(totalBoundsCorners[i]));
             }
 
+            totalBoundsCorners.Clear();
+            childTransforms.Clear(); // Avoid keeping reference to Unity objects to avoid "Leaked Memory Shell"
             return finalBounds;
         }
 
diff --git a/org.mixedrealitytoolkit.uxcore/Interop/UGUIInputAdapter.cs b/org.mixedrealitytoolkit.uxcore/Interop/UGUIInputAdapter.cs
index 26723be67..f38562598 100644
--- a/org.mixedrealitytoolkit.uxcore/Interop/UGUIInputAdapter.cs
+++ b/org.mixedrealitytoolkit.uxcore/Interop/UGUIInputAdapter.cs
@@ -164,6 +164,19 @@ protected override void OnDisable()
             }
         }
 
+        /// <summary>
+        /// A Unity event function that is called when the script component has been destroyed.
+        /// </summary>
+        protected override void OnDestroy()
+        {
+            base.OnDestroy();
+            if (InteractionManager != null)
+            {
+                InteractionManager.interactorRegistered -= OnInteractorRegistered;
+                InteractionManager.interactorUnregistered -= OnInteractorUnregistered;
+            }
+        }
+
         /// <summary>
         /// Called when a an <see cref="IXRInteractor"/> is registered with a Unity <see cref="XRInteractionManager"/>.
         /// </summary>