TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-14 08:04:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'TorqueGameEngines:development' into UpdateAssimp_5.2.5

Browse source
This commit is contained in:
Bloodknight 2022-10-15 08:22:16 +01:00 • committed by GitHub
commit 19e284f5ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Engine/source/gfx/gfxTextureArray.cpp
View file

@ -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)); 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)); 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); GBitmap* inBitmap = TEXMGR->loadUncompressedTexture(texture->getPath(), &GFXTexturePersistentProfile, mWidth, mHeight);
if (!inBitmap->setFormat(mFormat)) if (!inBitmap->setFormat(mFormat))