From b4f941af037990fd9bf31860e8aad9d3e7923d43 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Thu, 1 Mar 2018 08:42:08 -0800
Subject: [PATCH] finish purge of RayPick from grab.js

---
 scripts/system/controllers/grab.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/system/controllers/grab.js b/scripts/system/controllers/grab.js
index b62cb3dd90..1171703847 100644
--- a/scripts/system/controllers/grab.js
+++ b/scripts/system/controllers/grab.js
@@ -15,7 +15,7 @@
 //
 
 /* global MyAvatar, Entities, Script, Camera, Vec3, Reticle, Overlays, getEntityCustomData, Messages, Quat, Controller,
-   isInEditMode, HMD entityIsGrabbable, Pointers, PickType RayPick*/
+   isInEditMode, HMD entityIsGrabbable, Picks, PickType, Pointers*/
 
 
 (function() { // BEGIN LOCAL_SCOPE
@@ -258,14 +258,14 @@ function Grabber() {
     this.liftKey = false; // SHIFT
     this.rotateKey = false; // CONTROL
 
-    this.mouseRayOverlays = RayPick.createRayPick({
+    this.mouseRayOverlays = Picks.createPick(PickType.Ray, {
         joint: "Mouse",
         filter: Picks.PICK_OVERLAYS,
         enabled: true
     });
     var tabletItems = getMainTabletIDs();
     if (tabletItems.length > 0) {
-        RayPick.setIncludeItems(this.mouseRayOverlays, tabletItems);
+        Picks.setIncludeItems(this.mouseRayOverlays, tabletItems);
     }
     var renderStates = [{name: "grabbed", end: beacon}];
     this.mouseRayEntities = Pointers.createPointer(PickType.Ray, {
@@ -328,7 +328,7 @@ Grabber.prototype.pressEvent = function(event) {
         return;
     }
 
-    var overlayResult = RayPick.getPrevRayPickResult(this.mouseRayOverlays);
+    var overlayResult = Picks.getPrevPickResult(this.mouseRayOverlays);
     if (overlayResult.type != Picks.INTERSECTED_NONE) {
         return;
     }
@@ -599,7 +599,7 @@ Grabber.prototype.keyPressEvent = function(event) {
 
 Grabber.prototype.cleanup = function() {
     Pointers.removePointer(this.mouseRayEntities);
-    RayPick.removeRayPick(this.mouseRayOverlays);
+    Picks.removePick(this.mouseRayOverlays);
 };
 
 var grabber = new Grabber();