Pārlūkot izejas kodu

Merge pull request #4859 from assimp/kimkulling/fix_signed_unsigned_mismatch_warning-issue-4854

Fix: Fix signed unsigned mismatch
Kim Kulling 2 gadi atpakaļ
vecāks
revīzija
767644cd3f
1 mainītis faili ar 1 papildinājumiem un 1 dzēšanām
  1. 1 1
      include/assimp/scene.h

+ 1 - 1
include/assimp/scene.h

@@ -433,7 +433,7 @@ struct aiScene
         for (unsigned int i = 0; i < mNumTextures; i++) {
         for (unsigned int i = 0; i < mNumTextures; i++) {
             const char* shortTextureFilename = GetShortFilename(mTextures[i]->mFilename.C_Str());
             const char* shortTextureFilename = GetShortFilename(mTextures[i]->mFilename.C_Str());
             if (strcmp(shortTextureFilename, shortFilename) == 0) {
             if (strcmp(shortTextureFilename, shortFilename) == 0) {
-                return std::make_pair(mTextures[i], i);
+                return std::make_pair(mTextures[i], static_cast<int>(i));
             }
             }
         }
         }
         return std::make_pair(nullptr, -1);
         return std::make_pair(nullptr, -1);