diff --git a/Assets/VRTK/Source/Scripts/Interactions/Interactables/VRTK_InteractableObject.cs b/Assets/VRTK/Source/Scripts/Interactions/Interactables/VRTK_InteractableObject.cs index f42a169b2..d34043042 100644 --- a/Assets/VRTK/Source/Scripts/Interactions/Interactables/VRTK_InteractableObject.cs +++ b/Assets/VRTK/Source/Scripts/Interactions/Interactables/VRTK_InteractableObject.cs @@ -635,7 +635,7 @@ public virtual void ToggleHighlight(bool toggle, Color? highlightColor = null) public virtual void Highlight(Color highlightColor) { VRTK_InteractObjectHighlighter interactObjectHighlighter = GetComponentInChildren(); - if(interactObjectHighlighter != null) + if (interactObjectHighlighter != null) { interactObjectHighlighter.Highlight(highlightColor); } diff --git a/Assets/VRTK/Source/Scripts/Interactions/Interactors/VRTK_InteractTouch.cs b/Assets/VRTK/Source/Scripts/Interactions/Interactors/VRTK_InteractTouch.cs index 7b07f101b..718e6153f 100644 --- a/Assets/VRTK/Source/Scripts/Interactions/Interactors/VRTK_InteractTouch.cs +++ b/Assets/VRTK/Source/Scripts/Interactions/Interactors/VRTK_InteractTouch.cs @@ -260,6 +260,7 @@ protected virtual void Awake() protected virtual void OnEnable() { destroyColliderOnDisable = false; + controllerCollisionDetector = (customColliderContainer != null ? customColliderContainer : controllerCollisionDetector); VRTK_PlayerObject.SetPlayerObject(gameObject, VRTK_PlayerObject.ObjectTypes.Controller); CreateTouchRigidBody(); trackedController = GetComponentInParent();