From d4f5856304764696770c8598d5155c01eb072ec7 Mon Sep 17 00:00:00 2001
From: sippeangelo <holmberg.simon@gmail.com>
Date: Thu, 17 Dec 2015 10:44:34 +0100
Subject: [PATCH] Component attributes no longer get set on the wrong entity
 when switching selection while editing a field

---
 src/Engine/Editor/EditorSystem.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Engine/Editor/EditorSystem.cpp b/src/Engine/Editor/EditorSystem.cpp
index d27a463b..2463aec6 100644
--- a/src/Engine/Editor/EditorSystem.cpp
+++ b/src/Engine/Editor/EditorSystem.cpp
@@ -199,6 +199,7 @@ bool EditorSystem::OnPicking(const Events::Picking& e)
                     //auto selectionTransform = m_World->GetComponent(m_Selection, "Transform");
                     //widgetTransform["Position"] = (glm::vec3)selectionTransform["Position"];
                 } else {
+                    ImGui::SetActiveID(0, nullptr);
                     m_Selection = entity;
                     setWidgetMode(m_WidgetMode);
                 }