Guard against a potential null ref

keveleigh · keveleigh · commit 195722525a75 · 2021-05-24T17:50:04.000-07:00
diff --git a/Assets/MRTK/Core/Definitions/Devices/ArticulatedHandDefinition.cs b/Assets/MRTK/Core/Definitions/Devices/ArticulatedHandDefinition.cs
@@ -131,10 +131,9 @@ public bool IsInPointingPose
                 if (unityJointPoses.TryGetValue(TrackedHandJoint.Palm, out palmJoint))
                 {
                     Vector3 palmNormal = palmJoint.Rotation * (-1 * Vector3.up);
-                    if (cursorBeamBackwardTolerance >= 0)
+                    if (cursorBeamBackwardTolerance >= 0 && CameraCache.Main != null)
                     {
-                        Vector3 cameraBackward = -CameraCache.Main.transform.forward;
-                        if (Vector3.Dot(palmNormal.normalized, cameraBackward) > cursorBeamBackwardTolerance)
+                        if (Vector3.Dot(palmNormal.normalized, -CameraCache.Main.transform.forward) > cursorBeamBackwardTolerance)
                         {
                             return false;
                         }

Original file line number	Diff line number	Diff line change
`@@ -131,10 +131,9 @@ public bool IsInPointingPose`
`131`	`131`	`if (unityJointPoses.TryGetValue(TrackedHandJoint.Palm, out palmJoint))`
`132`	`132`	`{`
`133`	`133`	`Vector3 palmNormal = palmJoint.Rotation * (-1 * Vector3.up);`
`134`		`- if (cursorBeamBackwardTolerance >= 0)`
	`134`	`+ if (cursorBeamBackwardTolerance >= 0 && CameraCache.Main != null)`
`135`	`135`	`{`
`136`		`- Vector3 cameraBackward = -CameraCache.Main.transform.forward;`
`137`		`- if (Vector3.Dot(palmNormal.normalized, cameraBackward) > cursorBeamBackwardTolerance)`
	`136`	`+ if (Vector3.Dot(palmNormal.normalized, -CameraCache.Main.transform.forward) > cursorBeamBackwardTolerance)`
`138`	`137`	`{`
`139`	`138`	`return false;`
`140`	`139`	`}`