merge upstream

davidkline-ms · davidkline-ms · commit 16f8159c7bf7 · 2020-01-30T10:13:55.000-08:00
diff --git a/Assets/MixedRealityToolkit.Providers/XRSDK/GenericXRSDKCameraSettings.cs b/Assets/MixedRealityToolkit.Providers/XRSDK/GenericXRSDKCameraSettings.cs
@@ -4,6 +4,7 @@
 using Microsoft.MixedReality.Toolkit.CameraSystem;
 using Microsoft.MixedReality.Toolkit.Utilities;
 using UnityEngine;
+
 #if SPATIALTRACKING_ENABLED
 using UnityEngine.SpatialTracking;
 #endif // SPATIALTRACKING_ENABLED
@@ -42,6 +43,7 @@ public GenericXRSDKCameraSettings(
         /// <inheritdoc/>
         public override bool IsOpaque => XRSDKSubsystemHelpers.DisplaySubsystem?.displayOpaque ?? true;
 
+#if SPATIALTRACKING_ENABLED
         /// <inheritdoc/>
         public override void Enable()
         {
@@ -66,6 +68,7 @@ public override void Disable()
 
             base.Disable();
         }
+#endif // SPATIALTRACKING_ENABLED
 
 #endregion IMixedRealityCameraSettings
     }

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`using Microsoft.MixedReality.Toolkit.CameraSystem;`
`5`	`5`	`using Microsoft.MixedReality.Toolkit.Utilities;`
`6`	`6`	`using UnityEngine;`
	`7`	`+`
`7`	`8`	`#if SPATIALTRACKING_ENABLED`
`8`	`9`	`using UnityEngine.SpatialTracking;`
`9`	`10`	`#endif // SPATIALTRACKING_ENABLED`
`@@ -42,6 +43,7 @@ public GenericXRSDKCameraSettings(`
`42`	`43`	`/// <inheritdoc/>`
`43`	`44`	`public override bool IsOpaque => XRSDKSubsystemHelpers.DisplaySubsystem?.displayOpaque ?? true;`
`44`	`45`
	`46`	`+#if SPATIALTRACKING_ENABLED`
`45`	`47`	`/// <inheritdoc/>`
`46`	`48`	`public override void Enable()`
`47`	`49`	`{`
`@@ -66,6 +68,7 @@ public override void Disable()`
`66`	`68`
`67`	`69`	`base.Disable();`
`68`	`70`	`}`
	`71`	`+#endif // SPATIALTRACKING_ENABLED`
`69`	`72`
`70`	`73`	`#endregion IMixedRealityCameraSettings`
`71`	`74`	`}`