From: havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 <> Date: Sun, 2 May 2010 14:19:27 +0000 (+0000) Subject: UNMERGE X-Git-Tag: xonotic-v0.1.0preview~167 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d5553d6a6b3fa71b8870e99d250a694173910245;p=xonotic%2Fdarkplaces.git UNMERGE fix a crash on deformvertexes wave git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10163 d7cf8633-e32d-0410-b094-e92efae38249 ::stable-branch::unmerge=83541505084139df34de53d084b40fc0b807822c --- diff --git a/gl_rmain.c b/gl_rmain.c index f1b85512..a9c9a06b 100644 --- a/gl_rmain.c +++ b/gl_rmain.c @@ -10307,7 +10307,7 @@ void RSurf_PrepareVerticesForBatch(int batchneed, int texturenumsurfaces, const needsupdate |= BATCHNEED_VERTEXMESH_NORMAL | BATCHNEED_VERTEXMESH_VECTOR; break; case Q3DEFORM_WAVE: - batchneed |= BATCHNEED_ARRAY_VERTEX | BATCHNEED_ARRAY_NORMAL | BATCHNEED_ARRAY_TEXCOORD | BATCHNEED_NOGAPS; + batchneed |= BATCHNEED_ARRAY_VERTEX | BATCHNEED_ARRAY_TEXCOORD | BATCHNEED_NOGAPS; needsupdate |= BATCHNEED_VERTEXPOSITION | BATCHNEED_VERTEXMESH_VERTEX | BATCHNEED_VERTEXMESH_NORMAL | BATCHNEED_VERTEXMESH_VECTOR; break; case Q3DEFORM_BULGE: