Skip to content
This repository has been archived by the owner on Aug 11, 2024. It is now read-only.

Commit

Permalink
Fixed merge issues
Browse files Browse the repository at this point in the history
  • Loading branch information
StephenHodgson committed Aug 15, 2019
1 parent fc8d5e0 commit 681ce83
Showing 1 changed file with 0 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,6 @@ public Vector2 NudgeConstraints

private int prevPhysicsLayer;
private int boundingBoxPrevPhysicsLayer;
private float prevPointerExtent;
private SpatialMeshDisplayOptions prevSpatialMeshDisplay;

#region Monobehaviour Implementation
Expand Down Expand Up @@ -739,7 +738,6 @@ public virtual void BeginHold(MixedRealityPointerEventData eventData)
prevPointerExtent = primaryPointer.PointerExtent;
// update the pointer extent to prevent the object from popping to the end of the pointer
var currentRaycastDistance = primaryPointer.Result.Details.RayDistance;
prevPointerExtent = primaryPointer.PointerExtent;
primaryPointer.PointerExtent = currentRaycastDistance;
}

Expand Down

0 comments on commit 681ce83

Please sign in to comment.