Skip to content

Commit 5e58b4a

Browse files
authored
Merge pull request #2820 from StephenHodgson/vNEXT-LineEditorFix
Fixed line data provider gizmos when MRTK is not configured.
2 parents e7e444d + 30fa03c commit 5e58b4a

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

Assets/MixedRealityToolkit/_Core/Inspectors/Utilities/Lines/DataProviders/ParabolicConstrainedLineDataProviderInspector.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License. See LICENSE in the project root for license information.
33

4-
using Microsoft.MixedReality.Toolkit.Core.Utilities;
54
using Microsoft.MixedReality.Toolkit.Core.Utilities.Lines.DataProviders;
65
using UnityEditor;
76
using UnityEngine;
@@ -59,7 +58,7 @@ protected override void OnSceneGUI()
5958
if (EditorGUI.EndChangeCheck())
6059
{
6160
Undo.RecordObject(LineData, "Change Parabola Point Position");
62-
LineData.SetPoint(1, CameraCache.Main.transform.InverseTransformPoint(newTargetPosition));
61+
LineData.SetPoint(1, newTargetPosition);
6362
}
6463
}
6564
else if (Tools.current == Tool.Rotate)

Assets/MixedRealityToolkit/_Core/Inspectors/Utilities/Lines/DataProviders/SimpleLineDataProviderInspector.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License. See LICENSE in the project root for license information.
33

4-
using Microsoft.MixedReality.Toolkit.Core.Utilities;
54
using Microsoft.MixedReality.Toolkit.Core.Utilities.Lines.DataProviders;
65
using UnityEditor;
76
using UnityEngine;
@@ -56,7 +55,7 @@ protected override void OnSceneGUI()
5655
if (EditorGUI.EndChangeCheck())
5756
{
5857
Undo.RecordObject(LineData, "Change Simple Point Position");
59-
LineData.SetPoint(1, CameraCache.Main.transform.InverseTransformPoint(newTargetPosition));
58+
LineData.SetPoint(1, newTargetPosition);
6059
}
6160
}
6261
else if (Tools.current == Tool.Rotate)

Assets/MixedRealityToolkit/_Core/Inspectors/Utilities/Lines/DataProviders/SplineDataProviderInspector.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// Licensed under the MIT License. See LICENSE in the project root for license information.
33

44
using Microsoft.MixedReality.Toolkit.Core.Definitions.Utilities;
5-
using Microsoft.MixedReality.Toolkit.Core.Utilities;
65
using Microsoft.MixedReality.Toolkit.Core.Utilities.Lines.DataProviders;
76
using System.Collections.Generic;
87
using UnityEditor;
@@ -169,7 +168,7 @@ protected override void OnSceneGUI()
169168
if (EditorGUI.EndChangeCheck())
170169
{
171170
Undo.RecordObject(LineData, "Change Spline Point Position");
172-
LineData.SetPoint(i, CameraCache.Main.transform.InverseTransformPoint(newTargetPosition));
171+
LineData.SetPoint(i, newTargetPosition);
173172
}
174173

175174
if (isLastPoint)

0 commit comments

Comments
 (0)