cleanup pass

Author: StephenHodgson

Assets/MixedRealityToolkit-SDK/Features/UX/Scripts/Pointers/TouchPointer.cs

@@ -67,7 +67,7 @@ public override bool TryGetPointerPosition(out Vector3 position)
         {
             position = Vector3.zero;
             if (fingerId < 0) { return false; }
-            position = Result?.Details.Point ?? CameraCache.Main.ScreenPointToRay(UnityEngine.Input.GetTouch(FingerId).position).GetPoint(PointerExtent); ;
+            position = Result?.Details.Point ?? CameraCache.Main.ScreenPointToRay(UnityEngine.Input.GetTouch(FingerId).position).GetPoint(PointerExtent);
             return true;
         }
 

Assets/MixedRealityToolkit/_Core/Definitions/InputSystem/MixedRealityInputSystemProfile.cs

@@ -53,6 +53,7 @@ public MixedRealityPointerProfile PointerProfile
             get { return pointerProfile; }
             private set { pointerProfile = value; }
         }
+
         private IMixedRealitySpeechSystem speechSystem;
 
         /// <summary>
@@ -63,7 +64,7 @@ public MixedRealityPointerProfile PointerProfile
         /// <summary>
         /// Is the speech Commands Enabled?
         /// </summary>
-        public bool IsSpeechCommandsEnabled => speechCommandsProfile != null && MixedRealityManager.Instance.ActiveProfile.IsInputSystemEnabled && SpeechSystem != null;
+        public bool IsSpeechCommandsEnabled => speechCommandsProfile != null && SpeechSystem != null && MixedRealityManager.Instance.ActiveProfile.IsInputSystemEnabled;
 
         [SerializeField]
         [Tooltip("Speech Command profile for wiring up Voice Input to Actions.")]
@@ -115,6 +116,5 @@ public MixedRealityControllerMappingProfile ControllerMappingProfile
             get { return controllerMappingProfile; }
             private set { controllerMappingProfile = value; }
         }
-
     }
 }

Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityControllerMappingProfileInspector.cs

@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-using System;
 using Microsoft.MixedReality.Toolkit.Core.Definitions.Devices;
 using Microsoft.MixedReality.Toolkit.Core.Definitions.Utilities;
 using Microsoft.MixedReality.Toolkit.Core.Devices.OpenVR;
@@ -10,6 +9,7 @@
 using Microsoft.MixedReality.Toolkit.Core.Extensions;
 using Microsoft.MixedReality.Toolkit.Core.Interfaces.Devices;
 using Microsoft.MixedReality.Toolkit.Core.Managers;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using UnityEditor;

Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityInputSystemProfileInspector.cs

@@ -46,22 +46,11 @@ public override void OnInspectorGUI()
                 return;
             }
 
-            if (!MixedRealityManager.Instance.ActiveProfile.IsInputSystemEnabled)
+            if (GUILayout.Button("Back to Configuration Profile"))
             {
-                EditorGUILayout.HelpBox("No input system is enabled, or you need to specify the type in the main configuration profile.", MessageType.Error);
-
-                if (GUILayout.Button("Back to Configuration Profile"))
-                {
-                    Selection.activeObject = MixedRealityManager.Instance.ActiveProfile;
-                }
-
-                return;
+                Selection.activeObject = MixedRealityManager.Instance.ActiveProfile;
             }
 
-            if (GUILayout.Button("Back to Input Profile"))
-            {
-                Selection.activeObject = MixedRealityManager.Instance.ActiveProfile.InputSystemProfile;
-            }
             EditorGUILayout.Space();
             EditorGUILayout.LabelField("Input System Profile", EditorStyles.boldLabel);
             EditorGUILayout.HelpBox("The Input System Profile helps developers configure input no matter what platform you're building for.", MessageType.Info);