Merge remote-tracking branch 'origin/Recording' into Recording

2016-03-14 16:33:53 +01:00
parent b886d9146b fb3842ba5b
commit 494746ad8b
2 changed files with 49 additions and 11 deletions
@@ -43,6 +43,7 @@ private:
    EditorGUI::WidgetSpace m_WidgetSpace = EditorGUI::WidgetSpace::Global;
    EntityWrapper m_Widget = EntityWrapper::Invalid;
    EntityWrapper m_CurrentSelection = EntityWrapper::Invalid;
+    glm::vec3 m_CamVelocity;

    // Utility functions
    EntityWrapper importEntity(EntityWrapper parent, boost::filesystem::path filePath);