]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
UNMERGE
authorhavoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 <>
Sun, 2 May 2010 14:19:27 +0000 (14:19 +0000)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 24 Sep 2010 20:02:17 +0000 (22:02 +0200)
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

gl_rmain.c

index f1b8551293c0baa31863823d6893552b6e8ab35f..a9c9a06b983bfac025f44b666da8550b81a9906c 100644 (file)
@@ -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: