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
@@ -13,6 +13,7 @@

 #include <boost/filesystem/path.hpp>

+#include <boost/endian/buffers.hpp>
 #include "../Common.h"
 #include "../GLM.h"
 #include "../Core/ResourceManager.h"
@@ -20,14 +21,10 @@
 #include "Skeleton.h"
 #include "ShaderProgram.h"

-#include "boost\endian\buffers.hpp"
-
-
-
 class RawModelCustom : public Resource
 {
    friend class ResourceManager;
-
+    friend class Model;
 protected:
    RawModelCustom(std::string fileName);