From 43b8fd29f62a52f4035eb24aa87df2d398ea7fea Mon Sep 17 00:00:00 2001
From: sippeangelo <holmberg.simon@gmail.com>
Date: Thu, 21 Jan 2016 16:21:20 +0100
Subject: [PATCH] Fixed widget world movement

---
 src/Engine/Editor/EditorSystem.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Engine/Editor/EditorSystem.cpp b/src/Engine/Editor/EditorSystem.cpp
index 116ad4cc..1ef8b02b 100644
--- a/src/Engine/Editor/EditorSystem.cpp
+++ b/src/Engine/Editor/EditorSystem.cpp
@@ -136,7 +136,12 @@ bool EditorSystem::OnMouseRelease(const Events::MouseRelease& e)
 bool EditorSystem::OnWidgetDelta(const Events::WidgetDelta& e)
 {
     if (m_CurrentSelection.Valid()) {
-        (glm::vec3&)m_CurrentSelection["Transform"]["Position"] += glm::inverse(Transform::AbsoluteOrientation(m_CurrentSelection.World, m_CurrentSelection.ID)) * e.Translation;
+        glm::quat parentOrientation;
+        EntityWrapper parent = m_CurrentSelection.Parent();
+        if (parent.Valid()) {
+            parentOrientation = glm::inverse(Transform::AbsoluteOrientation(parent.World, parent.ID));
+        }
+        (glm::vec3&)m_CurrentSelection["Transform"]["Position"] += parentOrientation * e.Translation;
         m_EditorGUI->SetDirty(m_CurrentSelection);
     }
     return true;