Merge pull request #9356 from microsoft/prerelease/2.6.0_stabilization

Branch synchronization: prerelease/2.6.0_stabilization --> mrtk_development

Author: CDiaz-MS

Assets/MRTK/Core/Definitions/Devices/DeviceInputType.cs

@@ -14,15 +14,15 @@ public enum DeviceInputType
         Gaze,
         Voice,
         /// <summary>
-        /// 6 Dof Pointer with position and rotation.
+        /// 6-DoF pointer with position and rotation.
         /// </summary>
         SpatialPointer,
         /// <summary>
-        /// 3 Dof Pointer with only position.
+        /// 3-DoF pointer with only position.
         /// </summary>
         PointerPosition,
         /// <summary>
-        /// 3 Dof Pointer with only rotation.
+        /// 3-DoF pointer with only rotation.
         /// </summary>
         PointerRotation,
         PointerClick,
@@ -32,18 +32,18 @@ public enum DeviceInputType
         Trigger,
         TriggerTouch,
         TriggerNearTouch,
-        // TriggerPress, in some cases, maps to the Grab gesture.
+        // TriggerPress, in some cases, maps to the grab/grasp gesture.
         TriggerPress,
         /// <summary>
-        /// 6 DoF Grip with position and rotation.
+        /// 6-DoF grip with position and rotation.
         /// </summary>
         SpatialGrip,
         /// <summary>
-        /// 3 DoF Grip with only position.
+        /// 3-DoF grip with only position.
         /// </summary>
         GripPosition,
         /// <summary>
-        /// 3 Dof Grip with only rotation.
+        /// 3-DoF grip with only rotation.
         /// </summary>
         GripRotation,
         ThumbStick,
@@ -55,7 +55,7 @@ public enum DeviceInputType
         TouchpadNearTouch,
         TouchpadPress,
         /// <summary>
-        /// Select maps to the Pinch/Air Tap gesture
+        /// Select, in some cases, maps to the pinch/airtap gesture.
         /// </summary>
         Select,
         Start,
@@ -92,7 +92,7 @@ public enum DeviceInputType
         Grip,
         GripTouch,
         GripNearTouch,
-        // GripPress, in some cases, maps to the Grab gesture.
+        // GripPress, in some cases, maps to the grab/grasp gesture.
         GripPress,
     }
 }

Assets/MRTK/Core/Definitions/Devices/MixedRealityInteractionMapping.cs

@@ -396,9 +396,9 @@ public Vector2 Vector2Data
         }
 
         /// <summary>
-        /// The ThreeDof Vector3 Position data value.
+        /// The ThreeDoF Vector3 Position data value.
         /// </summary>
-        /// <remarks>Only supported for a ThreeDof mapping axis type</remarks>
+        /// <remarks>Only supported for a ThreeDoF mapping axis type</remarks>
         public Vector3 PositionData
         {
             get
@@ -421,9 +421,9 @@ public Vector3 PositionData
         }
 
         /// <summary>
-        /// The ThreeDof Quaternion Rotation data value.
+        /// The ThreeDoF Quaternion Rotation data value.
         /// </summary>
-        /// <remarks>Only supported for a ThreeDof mapping axis type</remarks>
+        /// <remarks>Only supported for a ThreeDoF mapping axis type</remarks>
         public Quaternion RotationData
         {
             get
@@ -446,7 +446,7 @@ public Quaternion RotationData
         /// <summary>
         /// The Pose data value.
         /// </summary>
-        /// <remarks>Only supported for a SixDof mapping axis type</remarks>
+        /// <remarks>Only supported for a SixDoF mapping axis type</remarks>
         public MixedRealityPose PoseData
         {
             get

Assets/MRTK/Core/Definitions/SpatialAwareness/Experimental/SpatialAwarenessSceneObject.cs

@@ -1,5 +1,5 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 
 using Microsoft.MixedReality.Toolkit.SpatialAwareness;
 using System.Collections.Generic;
@@ -138,7 +138,7 @@ public class QuadData
             public Vector2 Extents { get; set; }
 
             /// <summary>
-            /// The occulusion mask of the quad.
+            /// The occlusion mask of the quad.
             /// </summary>
             public byte[] OcclusionMask { get; set; }
 

Assets/MRTK/Core/Definitions/Utilities/MixedRealityPose.cs

@@ -38,7 +38,7 @@ public MixedRealityPose(Quaternion rotation)
         }
 
         /// <summary>
-        /// The default value for a Six Dof Transform.
+        /// The default value for a Six DoF Transform.
         /// </summary>
         /// <returns>
         /// <see href="https://docs.unity3d.com/ScriptReference/Vector3-zero.html">Vector3.zero</see> and <see href="https://docs.unity3d.com/ScriptReference/Quaternion-identity.html">Quaternion.identity</see>.

Assets/MRTK/Core/Definitions/Utilities/MixedRealityTransform.cs

@@ -54,7 +54,7 @@ public static MixedRealityTransform NewScale(Vector3 scale)
         }
 
         /// <summary>
-        /// The default value for a Six Dof Transform.
+        /// The default value for a Six DoF Transform.
         /// </summary>
         public static MixedRealityTransform Identity { get; } = new MixedRealityTransform(Vector3.zero, Quaternion.identity, Vector3.one);
 

Assets/MRTK/Core/Inspectors/MixedRealityStandardShaderGUI.cs

@@ -713,6 +713,8 @@ protected void AdvancedOptions(MaterialEditor materialEditor, Material material)
 
             materialEditor.EnableInstancingField();
 
+            GUI.enabled = true;
+
             materialEditor.ShaderProperty(stencil, Styles.stencil);
 
             if (PropertyEnabled(stencil))

Assets/MRTK/Core/Inspectors/MixedRealityToolkitFacadeHandler.cs

@@ -13,7 +13,7 @@ namespace Microsoft.MixedReality.Toolkit.Utilities.Facades
     /// Links service facade objects to active services.
     /// </summary>
     /// <remarks>
-    /// <para>This feature is is being deprecated in 2.5 and will be removed in a future release.
+    /// <para>This feature is being deprecated in 2.5 and will be removed in a future release.
     /// The code that remains will actively seek to remove existing facades in scenes to ensure that
     /// developers that update to 2.5 will get their scenes cleaned up appropriately.</para>
     /// </remarks>

Assets/MRTK/Core/Inspectors/Profiles/MixedRealityControllerMappingProfileInspector.cs

@@ -352,7 +352,7 @@ private void RenderControllerList(SerializedProperty controllerList)
         /// <summary>
         /// Resets the input actions of the controller mapping according to the mapping's GetDefaultInteractionMappings() function
         /// </summary>
-        /// <param name="controllerMapping">A reference to the controller mapping struct geing reset</param>
+        /// <param name="controllerMapping">A reference to the controller mapping struct getting reset</param>
         private void ResetInputActions(ref MixedRealityControllerMapping controllerMapping)
         {
             controllerMapping.SetDefaultInteractionMapping(true);

Assets/MRTK/Core/Inspectors/Utilities/InspectorUIUtility.cs

@@ -710,7 +710,7 @@ static public bool DrawScriptableFoldout<T>(SerializedProperty scriptable, strin
 
         /// <summary>
         /// Draws a foldout enlisting all components (or derived types) of the given type attached to the passed gameobject.
-        /// Adds a button for adding any of the component (or dervied types) and a follow button to highlight existing attached components.
+        /// Adds a button for adding any of the component (or derived types) and a follow button to highlight existing attached components.
         /// </summary>
         static public bool DrawComponentTypeFoldout<T>(GameObject gameObject, bool isExpanded, string typeDescription) where T : MonoBehaviour
         {

Assets/MRTK/Core/Providers/ObjectMeshObserver/Profiles/DefaultObjectMeshObserverProfile.asset

@@ -26,4 +26,5 @@ MonoBehaviour:
   visibleMaterial: {fileID: 2100000, guid: 47c3d3b0d8143e3489351498fceed55d, type: 2}
   occlusionMaterial: {fileID: 2100000, guid: a809c7ea182b699409443d46d5b42435, type: 2}
   physicsMaterial: {fileID: 0}
+  runtimeSpatialMeshPrefab: {fileID: 0}
   spatialMeshObject: {fileID: 100000, guid: 2d029f2a1321676428ce89872882c605, type: 3}