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/ColladaLoader.cpp
+++ b/code/ColladaLoader.cpp
@@ -52,12 +52,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "fast_atof.h"
 #include "ParsingUtils.h"
 #include "SkeletonMeshBuilder.h"
+#include "Defines.h"

 #include "time.h"
 #include <boost/foreach.hpp>
 #include "../include/assimp/DefaultLogger.hpp"
 #include "../include/assimp/Importer.hpp"
 #include <numeric>
+#include "Defines.h"


 using namespace Assimp;