Merge remote-tracking branch 'origin/Animations' into WeaponSystem

2016-02-10 20:47:33 +01:00
parent 0825b10c75 224e95f34a
commit 6396925b68
14 changed files with 912 additions and 364 deletions
@@ -61,14 +61,14 @@ void RenderSystem::fillModels(RenderScene::Queues &Jobs)
        }

        // Only render children of a camera if that camera is currently active
-         if (isChildOfACamera(entity) && !isChildOfCurrentCamera(entity)) {
-             continue;
-         } 
+        if (isChildOfACamera(entity) && !isChildOfCurrentCamera(entity)) {
+            continue;
+        }

        // Hide things parented to local player if they have the HiddenFromLocalPlayer component
-         if (entity.HasComponent("HiddenForLocalPlayer") && (entity == m_LocalPlayer || entity.IsChildOf(m_LocalPlayer))) {
-             continue;
-         }
+        if (entity.HasComponent("HiddenForLocalPlayer") && (entity == m_LocalPlayer || entity.IsChildOf(m_LocalPlayer))) {
+            continue;
+        }

        Model* model;
        try {