浏览代码

Merge branch 'TorqueGameEngines:development' into UpdateAssimp_5.2.5

Bloodknight 2 年之前
父节点
当前提交
19e284f5ab
共有 1 个文件被更改,包括 0 次插入5 次删除
  1. 0 5
      Engine/source/gfx/gfxTextureArray.cpp

+ 0 - 5
Engine/source/gfx/gfxTextureArray.cpp

@@ -131,11 +131,6 @@ void GFXTextureArray::setTexture(const GFXTexHandle& texture, U32 slot)
             AssertWarn(true, avar("GFXTextureArray::setTexture all textures should have at least the same number of mips: %i vs %i", texture->getMipLevels(), mMipLevels));
             Con::warnf(avar("GFXTextureArray::setTexture all textures should have at least the same number of mips: %i vs %i", texture->getMipLevels(), mMipLevels));
          }
-         else
-         {
-            AssertWarn(true, "GFXTextureArray::setTexture all textures should have the same format");
-            Con::warnf("GFXTextureArray::setTexture all textures should have the same format");
-         }
 
          GBitmap* inBitmap = TEXMGR->loadUncompressedTexture(texture->getPath(), &GFXTexturePersistentProfile, mWidth, mHeight);
          if (!inBitmap->setFormat(mFormat))