Updated WMR data provider inspector

XRTK.WindowsMixedReality/Assets/XRTK.Generated/CustomProfiles/MixedRealityPackageSettings.asset

@@ -11,7 +11,7 @@ MonoBehaviour:
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 15c83ddfe69772747b49823a06d56d32, type: 3}
   m_Name: MixedRealityPackageSettings
-  m_EditorClassIdentifier: 
+  m_EditorClassIdentifier:
   mixedRealityPackages:
   - name: com.xrtk.upm-git-extension
     displayName: XRTK.UpmGitExtension
@@ -30,10 +30,10 @@ MonoBehaviour:
     uri: https://github.com/XRTK/Lumin.git
     isDefaultPackage: 1
     isRequiredPackage: 0
-    isEnabled: 1
+    isEnabled: 0
   - name: com.xrtk.sdk
     displayName: XRTK.SDK
     uri: https://github.com/XRTK/SDK.git
     isDefaultPackage: 1
     isRequiredPackage: 0
-    isEnabled: 1
+    isEnabled: 0

XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/Inspectors/WindowsMixedRealityDataProviderProfileInspector.cs

@@ -3,10 +3,8 @@
 
 using UnityEditor;
 using UnityEngine;
-using XRTK.Definitions;
 using XRTK.Inspectors.Profiles;
 using XRTK.Inspectors.Utilities;
-using XRTK.Services;
 using XRTK.WindowsMixedReality.Profiles;
 
 namespace XRTK.WindowsMixedReality.Inspectors
@@ -24,11 +22,6 @@ protected override void OnEnable()
         {
             base.OnEnable();
 
-            if (!MixedRealityInspectorUtility.CheckMixedRealityConfigured(false))
-            {
-                return;
-            }
-
             windowsManipulationGestureSettings = serializedObject.FindProperty("manipulationGestures");
             useRailsNavigation = serializedObject.FindProperty("useRailsNavigation");
             windowsNavigationGestureSettings = serializedObject.FindProperty("navigationGestures");
@@ -40,18 +33,17 @@ public override void OnInspectorGUI()
         {
             MixedRealityInspectorUtility.RenderMixedRealityToolkitLogo();
 
-            if (!MixedRealityInspectorUtility.CheckMixedRealityConfigured()) { return; }
-
-            if (GUILayout.Button("Back to Controller Data Providers"))
+            if (thisProfile.ParentProfile != null &&
+                GUILayout.Button("Back to Controller Data Providers"))
             {
-                Selection.activeObject = MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.ControllerDataProvidersProfile;
+                Selection.activeObject = thisProfile.ParentProfile;
             }
 
             EditorGUILayout.Space();
             EditorGUILayout.LabelField("Windows Mixed Reality Controller Data Provider Settings", EditorStyles.boldLabel);
             EditorGUILayout.HelpBox("This profile aids in configuring additional platform settings for the registered controller data provider. This can be anything from additional gestures or platform specific settings.", MessageType.Info);
 
-            (target as BaseMixedRealityProfile).CheckProfileLock();
+            thisProfile.CheckProfileLock();
 
             serializedObject.Update();
             EditorGUILayout.Space();

XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/package.json

@@ -2,7 +2,7 @@
   "name": "com.xrtk.wmr",
   "displayName": "XRTK.WindowsMixedReality",
   "description": "The Windows Mixed Reality components for the Mixed Reality Toolkit",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "unity": "2019.1",
   "license": "MIT",
   "repository": {
@@ -12,6 +12,6 @@
   "src": "Assets/XRTK.WindowsMixedReality",
   "author": "XRTK Team (https://github.com/XRTK)",
   "dependencies": {
-    "com.xrtk.core": "0.1.5"
+    "com.xrtk.core": "0.1.10"
   }
 }

XRTK.WindowsMixedReality/Packages/manifest.json

@@ -6,10 +6,8 @@
     "com.unity.xr.oculus.standalone": "1.29.1",
     "com.unity.xr.openvr.standalone": "1.0.5",
     "com.unity.xr.windowsmr.metro": "1.0.8",
-    "com.xrtk.core": "https://github.com/XRTK/XRTK-Core.git#0.1.5",
-    "com.xrtk.lumin": "https://github.com/XRTK/Lumin.git#0.1.0",
-    "com.xrtk.sdk": "https://github.com/XRTK/SDK.git#0.1.3",
-    "com.xrtk.upm-git-extension": "https://github.com/XRTK/UpmGitExtension.git#0.9.4",
+    "com.xrtk.core": "https://github.com/XRTK/XRTK-Core.git#0.1.10",
+    "com.xrtk.upm-git-extension": "https://github.com/XRTK/UpmGitExtension.git#0.9.5",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.animation": "1.0.0",
     "com.unity.modules.assetbundle": "1.0.0",
@@ -43,20 +41,12 @@
   },
   "lock": {
     "com.xrtk.core": {
-      "hash": "b75aa57e097565bfb1c00a728c0e9b8714dee3c2",
-      "revision": "0.1.5"
-    },
-    "com.xrtk.lumin": {
-      "hash": "cf91e467e7151a830e36d39ecad2cd34cff32ae0",
-      "revision": "0.1.0"
-    },
-    "com.xrtk.sdk": {
-      "hash": "26e330d9da9910895760eca9674d3c9101548cfe",
-      "revision": "0.1.3"
+      "hash": "69f4126007422a60fc0e26b8ccf846e0f7118574",
+      "revision": "0.1.10"
     },
     "com.xrtk.upm-git-extension": {
-      "hash": "869a63adece6138e88881e85f89f7994983db696",
-      "revision": "0.9.4"
+      "hash": "4e5c893cdbb28c82f8d23756696515108fe130ef",
+      "revision": "0.9.5"
     }
   }
 }

XRTK.WindowsMixedReality/ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 2019.1.0f2
-m_EditorVersionWithRevision: 2019.1.0f2 (292b93d75a2c)
+m_EditorVersion: 2019.1.1f1
+m_EditorVersionWithRevision: 2019.1.1f1 (fef62e97e63b)