From 93426ccfb2bb56585e632dd84fb49aaeb83b0bf6 Mon Sep 17 00:00:00 2001
From: Manuel Martin <imanol.martin@gmail.com>
Date: Tue, 17 Mar 2020 16:56:48 +0100
Subject: [PATCH] Rebase fixes

---
 app/src/main/cpp/ControllerContainer.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/cpp/ControllerContainer.cpp b/app/src/main/cpp/ControllerContainer.cpp
index 21ef3cf88..651fe50cd 100644
--- a/app/src/main/cpp/ControllerContainer.cpp
+++ b/app/src/main/cpp/ControllerContainer.cpp
@@ -202,10 +202,12 @@ ControllerContainer::CreateController(const int32_t aControllerIndex, const int3
   CreationContextPtr create = m.context.lock();
   controller.transform = Transform::Create(create);
   controller.pointer = Pointer::Create(create);
+  controller.pointer->SetVisible(true);
   if (aControllerIndex != m.gazeIndex) {
     if ((m.models.size() >= aModelIndex) && m.models[aModelIndex]) {
       controller.transform->AddNode(m.models[aModelIndex]);
       controller.beamToggle = vrb::Toggle::Create(create);
+      controller.beamToggle->ToggleAll(true);
       if (aBeamTransform.IsIdentity()) {
         controller.beamParent = controller.beamToggle;
       } else {
@@ -215,7 +217,6 @@ ControllerContainer::CreateController(const int32_t aControllerIndex, const int3
         controller.beamToggle->AddNode(beamTransform);
       }
       controller.transform->AddNode(controller.beamToggle);
-      controller.beamToggle->ToggleAll(false);
       if (m.beamModel && controller.beamParent) {
         controller.beamParent->AddNode(m.beamModel);
       }