Merge branch 'MemoryOptimization' into Importer

# Conflicts: # include/Engine/Rendering/Model.h # src/Engine/Collision/Collision.cpp # src/Engine/Collision/CollisionSystem.cpp # src/Engine/Collision/TriggerSystem.cpp # src/Game/Systems/SpawnerSystem.cpp
2016-03-14 02:06:53 +01:00
parent 7e6830af35 0516794db6
commit f632b45c9b
17 changed files with 91 additions and 89 deletions
@@ -259,7 +259,7 @@ void ShadowPass::Draw(RenderScene & scene)
                                std::vector<glm::mat4> frameBones;
                                if (modelJob->BlendTree != nullptr) {
                                    frameBones = modelJob->BlendTree->GetFinalPose();
-                                } else {
+                                } else if (modelJob->Skeleton != nullptr) {
                                    frameBones = modelJob->Skeleton->GetTPose();
                                }
                                glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));