Skip to content

Commit 0af7860

Browse files
fixed a few regressions from the merge
1 parent 8e98fd2 commit 0af7860

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

Assets/MixedRealityToolkit-SDK/Features/UX/Prefabs/Pointers/DefaultControllerPointer.prefab

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ MonoBehaviour:
9696
m_Name:
9797
m_EditorClassIdentifier:
9898
handedness: 1
99-
disableChildren: 1
10099
destroyOnLost: 1
101100
useSourcePoseData: 0
102101
poseAction:
@@ -106,7 +105,6 @@ MonoBehaviour:
106105
cursorPrefab: {fileID: 1000012072213228, guid: 62718441f3682f94ab10c70a637e014b,
107106
type: 2}
108107
raycastOrigin: {fileID: 0}
109-
pointerOrientation: 0
110108
activeHoldAction:
111109
id: 0
112110
description: None
@@ -118,6 +116,7 @@ MonoBehaviour:
118116
requiresHoldAction: 0
119117
overrideGlobalPointerExtent: 0
120118
pointerExtent: 10
119+
pointerOrientation: 0
121120
LineColorSelected:
122121
serializedVersion: 2
123122
key0: {r: 1, g: 1, b: 1, a: 0}

Assets/MixedRealityToolkit-SDK/Features/UX/Prefabs/Pointers/ParabolicPointer.prefab

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,6 @@ MonoBehaviour:
260260
m_EditorClassIdentifier:
261261
handedness: 1
262262
destroyOnLost: 1
263-
destroyOnSourceLost: 1
264263
useSourcePoseData: 0
265264
poseAction:
266265
id: 4

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace Microsoft.MixedReality.Toolkit.SDK.UX.Pointers
2121
/// Base Pointer class for pointers that exist in the scene as GameObjects.
2222
/// </summary>
2323
[DisallowMultipleComponent]
24-
public abstract class BaseControllerPointer : ControllerPoseSynchronizer, IMixedRealityPointer
24+
public abstract class BaseControllerPointer : ControllerPoseSynchronizer, IMixedRealityPointer, IMixedRealityTeleportHandler
2525
{
2626
private static IMixedRealityTeleportSystem teleportSystem = null;
2727
protected static IMixedRealityTeleportSystem TeleportSystem => teleportSystem ?? (teleportSystem = MixedRealityManager.Instance.GetManager<IMixedRealityTeleportSystem>());

0 commit comments

Comments
 (0)