fix for upstream changes

2015-04-16 02:55:41 +02:00
parent 8c45a4dc3b
commit 611778045d
32 changed files with 100 additions and 21 deletions
--- a/code/MDLMaterialLoader.cpp
+++ b/code/MDLMaterialLoader.cpp
@@ -50,8 +50,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../include/assimp/texture.h"
 #include "../include/assimp/IOSystem.hpp"
 #include "../include/assimp/DefaultLogger.hpp"
-#include "qnan.h"
 #include "../include/assimp/scene.h"
+#include "qnan.h"
+#include "Defines.h"


 using namespace Assimp;