Skip to content

Commit f2f8480

Browse files
Merge branch 'mrtk_development' into vNEXT-Teleportation
2 parents 53b0df8 + 385e880 commit f2f8480

File tree

3 files changed

+6
-0
lines changed

3 files changed

+6
-0
lines changed

Assets/MixedRealityToolkit-SDK/Features/Input/MixedRealityInputManager.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,12 @@ public override void Initialize()
9191

9292
private void InitializeInternal()
9393
{
94+
if (CameraCache.Main.transform.parent == null)
95+
{
96+
var cameraParent = new GameObject("Body");
97+
CameraCache.Main.transform.SetParent(cameraParent.transform);
98+
}
99+
94100
focusProvider = CameraCache.Main.gameObject.EnsureComponent<FocusProvider>();
95101
gazeProvider = CameraCache.Main.gameObject.EnsureComponent<GazeProvider>();
96102

Assets/MixedRealityToolkit-SDK/Features/UX/Scripts/Utilities/InteractibleHighlight.cs renamed to Assets/MixedRealityToolkit-SDK/Features/UX/Scripts/Utilities/InteractableHighlight.cs

File renamed without changes.

Assets/MixedRealityToolkit-SDK/Features/UX/Scripts/Utilities/InteractibleHighlight.cs.meta renamed to Assets/MixedRealityToolkit-SDK/Features/UX/Scripts/Utilities/InteractableHighlight.cs.meta

File renamed without changes.

0 commit comments

Comments
 (0)