Resource manager OBJ vs Model conflict fixed

2014-04-27 08:07:18 +02:00
parent c4e127b154
commit cb6b0a58d8
7 changed files with 35 additions and 12 deletions
@@ -12,7 +12,9 @@
 #include <boost/filesystem/path.hpp>
 #include <boost/program_options.hpp>

-class OBJ
+#include "ResourceManager.h"
+
+class OBJ : public Resource
 {
 public:
 	struct MaterialInfo