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
@@ -110,7 +110,7 @@ struct ModelJob : RenderJob
        }

        if (model->IsSkinned()) {
-            Skeleton = Model->m_RawModel->m_Skeleton;
+            Skeleton = Model->m_Skeleton;

            if (Skeleton != nullptr) {
                EntityWrapper entityWrapper = EntityWrapper(world, modelComponent.EntityID);