OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' into v2.x

Browse source 
Conflicts:
	src/gl/textures/gl_material.cpp
This commit is contained in:
Christoph Oelckers 2014-09-09 01:30:11 +02:00
commit 9b8869e78d
18 changed files with 88 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/gl/data/gl_data.cpp
View file

@ -437,7 +437,6 @@ void gl_RecalcVertexHeights(vertex_t * v)
int i,j,k;
float height;
//@sync-vertexheights
v->numheights=0;
for(i=0;i<v->numsectors;i++)
{