Merge remote-tracking branch 'origin/master' into Menu

# Conflicts: # src/Engine/Rendering/Texture.cpp # src/Game/Game.cpp
2016-02-11 14:43:30 +01:00
parent 350effd8eb bbbab7b287
commit f0ae365401
106 changed files with 4052 additions and 940 deletions
@@ -106,7 +106,7 @@ Model::Model(std::string fileName)
        maxi = glm::max(maxi, v.Position);
    }

-    m_Box = AABB(maxi, mini);
+    m_Box = AABB(mini, maxi);
 }

 Model::~Model()