Merge branch 'master' into Glew_Version_For_Real

This commit is contained in:
Christoph Oelckers 2014-06-01 12:43:17 +02:00
commit 2ad47935ef
38 changed files with 616 additions and 475 deletions

View file

@ -711,7 +711,7 @@ CCMD(listlights)
if (dl->target)
{
FTextureID spr = gl_GetSpriteFrame(dl->target->sprite, dl->target->frame, 0, 0, NULL);
Printf(", frame = %s ", TexMan[spr]->Name);
Printf(", frame = %s ", TexMan[spr]->Name.GetChars());
}