Merge fixes

This commit is contained in:
2016-01-14 18:20:51 +01:00
parent 3a4f378ac5
commit 5e721325a4
10 changed files with 85 additions and 79 deletions
+3
View File
@@ -125,6 +125,9 @@ bool EditorSystem::OnMouseMove(const Events::MouseMove& e)
if (m_Selection == 0) {
return false;
}
if (m_Camera == nullptr) {
return false;
}
auto widgetTransform = m_World->GetComponent(m_Widget, "Transform");
glm::vec3 widgetOrientation = widgetTransform["Orientation"];