Merge pull request #3504 from Microsoft/beta2-stabilization

David Kline · web-flow · commit 1fb91d9a8f9d · 2019-02-21T15:19:02.000-08:00
Beta2 stabilization -&gt; mrtk development
diff --git a/Assets/MixedRealityToolkit/Inspectors/MixedRealityToolkitInspector.cs b/Assets/MixedRealityToolkit/Inspectors/MixedRealityToolkitInspector.cs
@@ -87,6 +87,12 @@ public override void OnInspectorGUI()
             {
                 MixedRealityToolkit.Instance.ResetConfiguration((MixedRealityToolkitConfigurationProfile)activeProfile.objectReferenceValue);
             }
+
+            if (activeProfile.objectReferenceValue != null)
+            {
+                Editor activeProfileEditor = Editor.CreateEditor(activeProfile.objectReferenceValue);
+                activeProfileEditor.OnInspectorGUI();
+            }
         }
 
         [MenuItem("Mixed Reality Toolkit/Configure...")]

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,12 @@ public override void OnInspectorGUI()`
`87`	`87`	`{`
`88`	`88`	`MixedRealityToolkit.Instance.ResetConfiguration((MixedRealityToolkitConfigurationProfile)activeProfile.objectReferenceValue);`
`89`	`89`	`}`
	`90`	`+`
	`91`	`+ if (activeProfile.objectReferenceValue != null)`
	`92`	`+ {`
	`93`	`+ Editor activeProfileEditor = Editor.CreateEditor(activeProfile.objectReferenceValue);`
	`94`	`+ activeProfileEditor.OnInspectorGUI();`
	`95`	`+ }`
`90`	`96`	`}`
`91`	`97`
`92`	`98`	`[MenuItem("Mixed Reality Toolkit/Configure...")]`