Merge pull request #137 from teamfisk/Importer

Export and import of collision meshes
2016-03-14 04:26:50 +01:00
parent 0e9be1d650 407149fbb0
commit 483091a1de
23 changed files with 368 additions and 225 deletions
@@ -261,7 +261,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]));