Merge pull request #1886 from TMaloteaux/master

fix(SDK): handle touch and classic controller plugged in - fixes #1866
ExtendRealityLtd · Sep 2, 2018 · f5b30c8 · f5b30c8
2 parents 863cdec + aa10e66
commit f5b30c8
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/Assets/VRTK/Source/SDK/Oculus/SDK_OculusController.cs b/Assets/VRTK/Source/SDK/Oculus/SDK_OculusController.cs
@@ -822,6 +822,7 @@ protected virtual OVRInput.Controller GetControllerMask(uint index)
 
             switch (activeControllerType)
             {
+                case OVRInput.Controller.Gamepad | OVRInput.Controller.RTouch | OVRInput.Controller.LTouch:
                 case OVRInput.Controller.Touch:
                     return (index == 0 ? OVRInput.Controller.LTouch : (index == 1 ? OVRInput.Controller.RTouch : OVRInput.Controller.None));
                 case OVRInput.Controller.LTouch: