rebuild Assimp because of lib->exe bug from assimp

diff --git a/Debug/Assimp32.dll b/Debug/Assimp32.dll
deleted file mode 100644 (file)
index 216f66e..0000000
Binary files a/Debug/Assimp32.dll and /dev/null differ

diff --git a/Debug/assimp.dll b/Debug/assimp.dll
new file mode 100644 (file)
index 0000000..4f525c6
Binary files /dev/null and b/Debug/assimp.dll differ

diff --git a/Weave/Graphix/Model/Model.cpp b/Weave/Graphix/Model/Model.cpp
index 6031d9246ff3b2c0089f01377d96122908a539ab..b203be08a9d7e2748ca6080c45fb1eaad75a4683 100644 (file)
--- a/Weave/Graphix/Model/Model.cpp
+++ b/Weave/Graphix/Model/Model.cpp
@@ -127,7 +127,7 @@ void Model::updateBB(const uint _numvertices, const float* _vertices)
 {
        BBmin = vec3(_vertices[0], _vertices[1], _vertices[2]);
        BBmax = BBmin;
-       for (auto i = 3; i < _numvertices * 3; ++i)
+       for (uint i = 3; i < _numvertices * 3; ++i)
        {
                if (_vertices[i] < BBmin[i % 3])
                        BBmin[i % 3] = _vertices[i];
@@ -144,10 +144,10 @@ void Model::updateBB(const uint _numvertices, const float* _vertices, const mat4
        BBmin = (vec3)(_modelMat * vec4(_vertices[0], _vertices[1], _vertices[2],1.f));
        BBmax = BBmin;
        vec3 tmpVert;
-       for (auto j = 3; j < _numvertices * 3; j += 3)
+       for (uint j = 3; j < _numvertices * 3; j += 3)
        {
                tmpVert = (vec3)(_modelMat * vec4(_vertices[j], _vertices[j + 1], _vertices[j + 2], 1));
-               for (auto i = 0; i < 3; ++i)
+               for (uint i = 0; i < 3; ++i)
                {
                        if (tmpVert[i] < BBmin[i])
                                BBmin[i] = tmpVert[i];

diff --git a/bin/Assimp32.dll b/bin/Assimp32.dll
deleted file mode 100644 (file)
index 216f66e..0000000
Binary files a/bin/Assimp32.dll and /dev/null differ

diff --git a/bin/assimp.dll b/bin/assimp.dll
new file mode 100644 (file)
index 0000000..4f525c6
Binary files /dev/null and b/bin/assimp.dll differ

diff --git a/lib/assimp.lib b/lib/assimp.lib
new file mode 100644 (file)
index 0000000..37cd39b
Binary files /dev/null and b/lib/assimp.lib differ

diff --git a/lib/x64/assimp.lib b/lib/x64/assimp.lib
deleted file mode 100644 (file)
index 9ba440e..0000000
Binary files a/lib/x64/assimp.lib and /dev/null differ

diff --git a/lib/x86/assimp.lib b/lib/x86/assimp.lib
deleted file mode 100644 (file)
index e67b84b..0000000
Binary files a/lib/x86/assimp.lib and /dev/null differ