diff --git a/code/BlenderBMesh.cpp b/code/BlenderBMesh.cpp index bf27a9396..c328947ae 100644 --- a/code/BlenderBMesh.cpp +++ b/code/BlenderBMesh.cpp @@ -180,7 +180,7 @@ void BlenderBMeshConverter::AddFace( int v1, int v2, int v3, int v4 ) // TODO - Work out how materials work face.mat_nr = 0; triMesh->mface.push_back( face ); - triMesh->totface = triMesh->mface.size( ); + triMesh->totface = static_cast(triMesh->mface.size( )); } // ------------------------------------------------------------------------------------------------ diff --git a/code/BlenderLoader.cpp b/code/BlenderLoader.cpp index 68388235f..713146eea 100644 --- a/code/BlenderLoader.cpp +++ b/code/BlenderLoader.cpp @@ -421,7 +421,7 @@ void BlenderImporter::ResolveImage(aiMaterial* out, const Material* mat, const M // check if the file contents are bundled with the BLEND file if (img->packedfile) { name.data[0] = '*'; - name.length = 1+ ASSIMP_itoa10(name.data+1,MAXLEN-1,conv_data.textures->size()); + name.length = 1+ ASSIMP_itoa10(name.data+1,static_cast(MAXLEN-1), static_cast(conv_data.textures->size())); conv_data.textures->push_back(new aiTexture()); aiTexture* tex = conv_data.textures->back(); @@ -1228,7 +1228,7 @@ aiNode* BlenderImporter::ConvertNode(const Scene& in, const Object* obj, Convers if (conv_data.meshes->size() > old) { node->mMeshes = new unsigned int[node->mNumMeshes = static_cast(conv_data.meshes->size()-old)]; for (unsigned int i = 0; i < node->mNumMeshes; ++i) { - node->mMeshes[i] = i + old; + node->mMeshes[i] = static_cast(i + old); } }} break; diff --git a/code/BlenderTessellator.cpp b/code/BlenderTessellator.cpp index c29b27de1..60879b417 100644 --- a/code/BlenderTessellator.cpp +++ b/code/BlenderTessellator.cpp @@ -412,9 +412,9 @@ float BlenderTessellatorP2T::FindLargestMatrixElem( const aiMatrix3x3& mtx ) con { float result = 0.0f; - for ( size_t x = 0; x < 3; ++x ) + for ( unsigned int x = 0; x < 3; ++x ) { - for ( size_t y = 0; y < 3; ++y ) + for ( unsigned int y = 0; y < 3; ++y ) { result = p2tMax( std::fabs( mtx[ x ][ y ] ), result ); } @@ -429,9 +429,9 @@ aiMatrix3x3 BlenderTessellatorP2T::ScaleMatrix( const aiMatrix3x3& mtx, float sc { aiMatrix3x3 result; - for ( size_t x = 0; x < 3; ++x ) + for ( unsigned int x = 0; x < 3; ++x ) { - for ( size_t y = 0; y < 3; ++y ) + for ( unsigned int y = 0; y < 3; ++y ) { result[ x ][ y ] = mtx[ x ][ y ] * scale; } diff --git a/test/unit/utBlenderIntermediate.cpp b/test/unit/utBlenderIntermediate.cpp index 0bf40936b..98c87f9c8 100644 --- a/test/unit/utBlenderIntermediate.cpp +++ b/test/unit/utBlenderIntermediate.cpp @@ -40,6 +40,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "UnitTestPCH.h" #include "BlenderIntermediate.h" +#include "./../include/assimp/camera.h" +#include "./../include/assimp/light.h" +#include "./../include/assimp/mesh.h" +#include "./../include/assimp/texture.h" using namespace ::Assimp; using namespace ::Assimp::Blender;