Merge pull request #2658 from wassx/mrtk_development

David Kline · web-flow · commit e1e36b210ec7 · 2018-08-28T21:06:06.000-07:00
Fixed parenting of cursor
diff --git a/Assets/MixedRealityToolkit-SDK/Features/Input/GazeProvider.cs b/Assets/MixedRealityToolkit-SDK/Features/Input/GazeProvider.cs
@@ -272,7 +272,7 @@ private void Start()
         {
             if (cursorPrefab != null)
             {
-                var cursorObj = Instantiate(cursorPrefab);
+                var cursorObj = Instantiate(cursorPrefab, transform.parent);
                 GazePointer.BaseCursor = cursorObj.GetComponent<IMixedRealityCursor>();
                 Debug.Assert(GazePointer.BaseCursor != null, "Failed to load cursor");
                 GazePointer.BaseCursor.Pointer = GazePointer;

Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,7 @@ private void Start()`
`272`	`272`	`{`
`273`	`273`	`if (cursorPrefab != null)`
`274`	`274`	`{`
`275`		`- var cursorObj = Instantiate(cursorPrefab);`
	`275`	`+ var cursorObj = Instantiate(cursorPrefab, transform.parent);`
`276`	`276`	`GazePointer.BaseCursor = cursorObj.GetComponent<IMixedRealityCursor>();`
`277`	`277`	`Debug.Assert(GazePointer.BaseCursor != null, "Failed to load cursor");`
`278`	`278`	`GazePointer.BaseCursor.Pointer = GazePointer;`