Merge pull request #10014 from keveleigh/2.7.1-cherrypicks

keveleigh · web-flow · commit 4ea313d2775f · 2021-06-21T17:58:00.000-07:00
Fix build
diff --git a/Assets/MRTK/Providers/WindowsMixedReality/Shared/WindowsMixedRealityHandMeshProvider.cs b/Assets/MRTK/Providers/WindowsMixedReality/Shared/WindowsMixedRealityHandMeshProvider.cs
@@ -79,7 +79,8 @@ private void InitializeUVs(Vector3[] poseVertices)
             if (poseVertices.Length == 0)
             {
                 Debug.LogError("Loaded 0 vertices for poseVertices");
-                return System.Array.Empty<Vector2>();
+                handMeshUVsUnity = Array.Empty<Vector2>();
+                return;
             }
 
             float minY = poseVertices[0].y;

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,8 @@ private void InitializeUVs(Vector3[] poseVertices)`
`79`	`79`	`if (poseVertices.Length == 0)`
`80`	`80`	`{`
`81`	`81`	`Debug.LogError("Loaded 0 vertices for poseVertices");`
`82`		`- return System.Array.Empty<Vector2>();`
	`82`	`+ handMeshUVsUnity = Array.Empty<Vector2>();`
	`83`	`+ return;`
`83`	`84`	`}`
`84`	`85`
`85`	`86`	`float minY = poseVertices[0].y;`