Merge branch 'master' into release/3.3.0-alpha

thestonefox · thestonefox · commit 321ee82671d5 · 2017-08-27T19:03:07.000+01:00
diff --git a/Assets/VRTK/Scripts/Interactions/VRTK_InteractGrab.cs b/Assets/VRTK/Scripts/Interactions/VRTK_InteractGrab.cs
@@ -433,14 +433,6 @@ protected virtual void InitPrimaryGrab(VRTK_InteractableObject currentGrabbedObj
 
         protected virtual void InitSecondaryGrab(VRTK_InteractableObject currentGrabbedObject)
         {
-            if (!currentGrabbedObject.IsValidInteractableController(gameObject, currentGrabbedObject.allowedGrabControllers))
-            {
-                grabbedObject = null;
-                influencingGrabbedObject = false;
-                currentGrabbedObject.Ungrabbed(this);
-                return;
-            }
-
             influencingGrabbedObject = true;
             currentGrabbedObject.Grabbed(this);
         }

Original file line number	Diff line number	Diff line change
`@@ -433,14 +433,6 @@ protected virtual void InitPrimaryGrab(VRTK_InteractableObject currentGrabbedObj`
`433`	`433`
`434`	`434`	`protected virtual void InitSecondaryGrab(VRTK_InteractableObject currentGrabbedObject)`
`435`	`435`	`{`
`436`		`- if (!currentGrabbedObject.IsValidInteractableController(gameObject, currentGrabbedObject.allowedGrabControllers))`
`437`		`- {`
`438`		`- grabbedObject = null;`
`439`		`- influencingGrabbedObject = false;`
`440`		`- currentGrabbedObject.Ungrabbed(this);`
`441`		`- return;`
`442`		`- }`
`443`		`-`
`444`	`436`	`influencingGrabbedObject = true;`
`445`	`437`	`currentGrabbedObject.Grabbed(this);`
`446`	`438`	`}`