OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' into Glew_Version_For_Real

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
src/gl/shaders/gl_shader.cpp
View file

@ -546,7 +546,7 @@ void gl_ParseHardwareShader(FScanner &sc, int deflump)
{
if (tex->bWarped != 0)
{
Printf("Cannot combine warping with hardware shader on texture '%s'\n", tex->Name);
Printf("Cannot combine warping with hardware shader on texture '%s'\n", tex->Name.GetChars());
return;
}
tex->gl_info.shaderspeed = speed;