Change to MSFT_OPENXR_1_4_0_OR_NEWER (#10589)

Author: keveleigh

Assets/MRTK/Providers/OpenXR/MRTK.OpenXR.asmdef

@@ -28,7 +28,7 @@
         {
             "name": "com.microsoft.mixedreality.openxr",
             "expression": "1.4.0",
-            "define": "UNITY_OPENXR_1_4_0_OR_NEWER"
+            "define": "MSFT_OPENXR_1_4_0_OR_NEWER"
         },
         {
             "name": "com.unity.xr.openxr",

Assets/MRTK/Providers/OpenXR/Scripts/OpenXRDeviceManager.cs

@@ -125,19 +125,19 @@ public override void Disable()
             }
 
             gestureRecognizer?.Stop();
-#if UNITY_OPENXR_1_4_0_OR_NEWER
+#if MSFT_OPENXR_1_4_0_OR_NEWER
             gestureRecognizer?.Destroy();
 #else
             gestureRecognizer?.Dispose();
-#endif // UNITY_OPENXR_1_4_0_OR_NEWER
+#endif
             gestureRecognizer = null;
 
             navigationGestureRecognizer?.Stop();
-#if UNITY_OPENXR_1_4_0_OR_NEWER
+#if MSFT_OPENXR_1_4_0_OR_NEWER
             navigationGestureRecognizer?.Destroy();
 #else
             navigationGestureRecognizer?.Dispose();
-#endif // UNITY_OPENXR_1_4_0_OR_NEWER
+#endif
             navigationGestureRecognizer = null;
 
             base.Disable();

Assets/MRTK/Providers/OpenXR/Scripts/OpenXRSpatialAwarenessMeshObserver.cs

@@ -81,9 +81,9 @@ private bool SetMeshComputeSettings(SpatialAwarenessMeshDisplayOptions option, S
         {
             MeshComputeSettings settings = new MeshComputeSettings
             {
-#if !UNITY_OPENXR_1_4_0_OR_NEWER
+#if !MSFT_OPENXR_1_4_0_OR_NEWER
                 MeshType = (option == SpatialAwarenessMeshDisplayOptions.Visible) ? MeshType.Visual : MeshType.Collider,
-#endif // !UNITY_OPENXR_1_4_0_OR_NEWER
+#endif
                 VisualMeshLevelOfDetail = MapMRTKLevelOfDetailToOpenXR(levelOfDetail),
                 MeshComputeConsistency = MeshComputeConsistency.OcclusionOptimized,
             };