Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer

2016-02-10 22:18:42 +01:00
parent f05d0a1b0c ed06eacf6f
commit 675a80e905
8 changed files with 55 additions and 21 deletions
@@ -135,7 +135,7 @@ Model::Model(std::string fileName)
        maxi = glm::max(maxi, v.Position);
    }

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

 Model::~Model()