Merge pull request #10008 from keveleigh/2.7.1-cherrypicks

Add early return if array length is 0
microsoft · Jun 21, 2021 · aaef3ae · aaef3ae
2 parents 0c813f5 + 9b12b12
commit aaef3ae
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Assets/MRTK/Providers/OpenXR/Scripts/OpenXRHandMeshProvider.cs b/Assets/MRTK/Providers/OpenXR/Scripts/OpenXRHandMeshProvider.cs
@@ -122,7 +122,8 @@ private Vector2[] InitializeUVs(Vector3[] neutralPoseVertices)
         {
             if (neutralPoseVertices.Length == 0)
             {
-                Debug.LogError("Loaded 0 verts for neutralPoseVertices");
+                Debug.LogError("Loaded 0 vertices for neutralPoseVertices");
+                return System.Array.Empty<Vector2>();
             }
 
             float minY = neutralPoseVertices[0].y;

diff --git a/Assets/MRTK/Providers/WindowsMixedReality/Shared/WindowsMixedRealityHandMeshProvider.cs b/Assets/MRTK/Providers/WindowsMixedReality/Shared/WindowsMixedRealityHandMeshProvider.cs
@@ -78,7 +78,8 @@ private void InitializeUVs(Vector3[] poseVertices)
         {
             if (poseVertices.Length == 0)
             {
-                Debug.LogError("Loaded 0 verts for poseVertices");
+                Debug.LogError("Loaded 0 vertices for poseVertices");
+                return System.Array.Empty<Vector2>();
             }
 
             float minY = poseVertices[0].y;