Skip to content
Permalink
Browse files

Merge pull request #2029 from ExtendRealityLtd/fix/pointer-selection

fix(Pointers): ensure correct order for pointer actions - fixes #2027
  • Loading branch information...
thestonefox committed Jun 9, 2019
2 parents c04f2c3 + a75b655 commit 6e769d48c70ddd226f374c456590355e395d506d
Showing with 4 additions and 2 deletions.
  1. +4 −2 Prefabs/Pointers/SharedResources/Scripts/PointerConfigurator.cs
@@ -126,6 +126,7 @@ public virtual void ConfigureActivationAction()
/// </summary>
public virtual void ConfigureSelectionType()
{
ActivationAction.gameObject.SetActive(false);
switch (Facade.SelectionMethod)
{
case PointerFacade.SelectionType.SelectOnActivate:
@@ -137,6 +138,9 @@ public virtual void ConfigureSelectionType()
SelectOnDeactivatedAction.gameObject.SetActive(true);
break;
}
ConfigureSelectionAction();
ConfigureActivationAction();
ActivationAction.gameObject.SetActive(true);
}

/// <summary>
@@ -197,8 +201,6 @@ protected virtual void OnEnable()
{
ConfigureTargetValidity();
ConfigureFollowSources();
ConfigureSelectionAction();
ConfigureActivationAction();
ConfigureSelectionType();
}
}

0 comments on commit 6e769d4

Please sign in to comment.
You can’t perform that action at this time.