Merge branch 'master' into release/3.3.0-alpha

thestonefox · thestonefox · commit 93a32513697f · 2017-09-06T08:29:01.000+01:00
diff --git a/Assets/VRTK/Source/Scripts/Interactions/VRTK_InteractTouch.cs b/Assets/VRTK/Source/Scripts/Interactions/VRTK_InteractTouch.cs
@@ -239,7 +239,7 @@ public virtual void ForceStopTouching()
         /// <returns>An array of colliders that are associated with the controller.</returns>
         public virtual Collider[] ControllerColliders()
         {
-            return (controllerCollisionDetector != null && controllerCollisionDetector.GetComponents<Collider>().Length > 0 ? controllerCollisionDetector.GetComponents<Collider>() : controllerCollisionDetector.GetComponentsInChildren<Collider>());
+            return (controllerCollisionDetector != null ? controllerCollisionDetector.GetComponentsInChildren<Collider>() : new Collider[0]);
         }
 
         /// <summary>

Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,7 @@ public virtual void ForceStopTouching()`
`239`	`239`	`/// <returns>An array of colliders that are associated with the controller.</returns>`
`240`	`240`	`public virtual Collider[] ControllerColliders()`
`241`	`241`	`{`
`242`		`- return (controllerCollisionDetector != null && controllerCollisionDetector.GetComponents<Collider>().Length > 0 ? controllerCollisionDetector.GetComponents<Collider>() : controllerCollisionDetector.GetComponentsInChildren<Collider>());`
	`242`	`+ return (controllerCollisionDetector != null ? controllerCollisionDetector.GetComponentsInChildren<Collider>() : new Collider[0]);`
`243`	`243`	`}`
`244`	`244`
`245`	`245`	`/// <summary>`