Skip to content

Commit 52aaaa7

Browse files
authored
Merge pull request #3623 from Alexees/mrtk_spatialObserverFix
fixed NullReference
2 parents d9f17a4 + 9e21f31 commit 52aaaa7

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

Assets/MixedRealityToolkit/Definitions/SpatialAwareness/SpatialAwarenessMeshObject.cs

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,17 +74,22 @@ public static SpatialAwarenessMeshObject Create(Mesh mesh, int layer, string nam
7474
/// <param name="destroyMeshes"></param>
7575
public static void Cleanup(SpatialAwarenessMeshObject meshObject, bool destroyGameObject = true, bool destroyMeshes = true)
7676
{
77-
if (destroyGameObject && (meshObject.GameObject != null))
77+
if (meshObject.GameObject == null)
78+
{
79+
return;
80+
}
81+
82+
if (destroyGameObject)
7883
{
7984
UnityEngine.Object.Destroy(meshObject.GameObject);
8085
meshObject.GameObject = null;
86+
return;
8187
}
8288

83-
Mesh filterMesh = meshObject.Filter.sharedMesh;
84-
Mesh colliderMesh = meshObject.Collider.sharedMesh;
85-
8689
if (destroyMeshes)
8790
{
91+
Mesh filterMesh = meshObject.Filter.sharedMesh;
92+
Mesh colliderMesh = meshObject.Collider.sharedMesh;
8893

8994
if (filterMesh != null)
9095
{

0 commit comments

Comments
 (0)