Explorar o código

Merge pull request #481 from Azaezel/alpha40/profileconflictreport

report which profile usages are conflicting (was,is)
Jeff Hutchinson %!s(int64=4) %!d(string=hai) anos
pai
achega
c19bb29a16
Modificáronse 1 ficheiros con 1 adicións e 1 borrados
  1. 1 1
      Engine/source/gfx/gfxTextureManager.cpp

+ 1 - 1
Engine/source/gfx/gfxTextureManager.cpp

@@ -271,7 +271,7 @@ GFXTextureObject *GFXTextureManager::_lookupTexture( const char *hashName, const
    if (ret && (ret->mProfile->compareFlags(*profile)))
       return ret;
    else if (ret)
-      Con::warnf("GFXTextureManager::_lookupTexture: Cached texture %s has a different profile flag", hashName);
+      Con::warnf("GFXTextureManager::_lookupTexture: Cached texture %s has different profile flags: (%s,%s) ", hashName, ret->mProfile->getName().c_str(), profile->getName().c_str());
 
    return NULL;
 }