Merge branch 'Cleanup'

# Conflicts: # src/Engine/Rendering/RenderSystem.cpp
2016-01-27 13:37:26 +01:00
parent 0334ec3fa7 5fcd26cd3e
commit dec2234019
31 changed files with 209 additions and 160 deletions
@@ -12,7 +12,7 @@ EditorRenderSystem::EditorRenderSystem(World* m_World, EventBroker* eventBroker,

 void EditorRenderSystem::Update(double dt)
 {
-    if (m_CurrentCamera) {
+    if (m_CurrentCamera.Valid()) {
        ComponentWrapper cameraTransform = m_CurrentCamera["Transform"];
        m_EditorCamera->SetPosition(cameraTransform["Position"]);
        m_EditorCamera->SetOrientation(glm::quat((const glm::vec3&)cameraTransform["Orientation"]));