Merge pull request #3419 from keveleigh/fix-spatial-cleanup

David Kline · web-flow · commit 0cbea35437ae · 2019-02-07T21:16:55.000-08:00
Update Spatial Awareness system cleanup
diff --git a/Assets/MixedRealityToolkit.Providers/WindowsMixedReality/WindowsMixedRealitySpatialMeshObserver.cs b/Assets/MixedRealityToolkit.Providers/WindowsMixedReality/WindowsMixedRealitySpatialMeshObserver.cs
@@ -304,10 +304,11 @@ private void CleanupObserver()
             if (Application.isPlaying)
             {
                 // Cleanup the scene objects are managing
-                if (ObservedObjectParent != null)
+                if (observedObjectParent != null)
                 {
-                    ObservedObjectParent.transform.DetachChildren();
+                    observedObjectParent.transform.DetachChildren();
                 }
+                
                 foreach (SpatialAwarenessMeshObject meshObject in meshes.Values)
                 {
                     if (meshObject != null)

Original file line number	Diff line number	Diff line change
`@@ -304,10 +304,11 @@ private void CleanupObserver()`
`304`	`304`	`if (Application.isPlaying)`
`305`	`305`	`{`
`306`	`306`	`// Cleanup the scene objects are managing`
`307`		`- if (ObservedObjectParent != null)`
	`307`	`+ if (observedObjectParent != null)`
`308`	`308`	`{`
`309`		`- ObservedObjectParent.transform.DetachChildren();`
	`309`	`+ observedObjectParent.transform.DetachChildren();`
`310`	`310`	`}`
	`311`	`+`
`311`	`312`	`foreach (SpatialAwarenessMeshObject meshObject in meshes.Values)`
`312`	`313`	`{`
`313`	`314`	`if (meshObject != null)`