Skip to content

Commit 0bb00a3

Browse files
authored
Merge pull request #6825 from microsoft/user/bethalha/default_profile
Added setting of default configuration profile in case there's none set for adding the mrtk gameobject to the scene
2 parents 2a6d36c + faf6b63 commit 0bb00a3

File tree

2 files changed

+8
-12
lines changed

2 files changed

+8
-12
lines changed

Assets/MixedRealityToolkit/Inspectors/Utilities/MixedRealityInspectorUtility.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,12 @@ public static void AddMixedRealityToolkitToScene(MixedRealityToolkitConfiguratio
8787
MixedRealityToolkit.SetActiveInstance(newInstance);
8888
Selection.activeObject = newInstance;
8989

90-
if (configProfile != null)
90+
if (configProfile == null)
91+
{
92+
// if we don't have a profile set we get the default profile
93+
newInstance.ActiveProfile = GetDefaultConfigProfile();
94+
}
95+
else
9196
{
9297
newInstance.ActiveProfile = configProfile;
9398
}

Documentation/GettingStartedWithTheMRTK.md

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -97,17 +97,8 @@ To create a **HoloLens application**, switch to Universal Windows Platform:
9797

9898
![Configure to scene](../Documentation/Images/MRTK_ConfigureScene.png)
9999

100-
4. In the Inspector, you will see a prompt like this:
101-
102-
![MRTK Configure Dialog](../Documentation/Images/MRTK_NoProfileMessage.png)
103-
104-
Click "OK".
105-
106-
5. Select "DefaultMixedRealityToolkitConfigurationProfile" from the list.
107-
108-
![MRTK Select Configure Dialog](../Documentation/Images/MRTK_SelectConfigurationProfile.png)
109-
110-
For more information on profiles, please see the [profiles](Profiles/Profiles.md) article.
100+
The inspector will now show the currently active MRTK configuration profile and the profile selection dropdown, where the default profile is already preselected.
101+
Profiles configure the behavior of MRTK core components and are described in more detail in the [profiles](Profiles/Profiles.md) article.
111102

112103
> [!NOTE]
113104
> If you are getting started on the HoloLens or HoloLens 2, you should choose the "DefaultHoloLens1ConfigurationProfile" or DefaultHoloLens2ConfigurationProfile" instead.

0 commit comments

Comments
 (0)