UNMERGE

optimize away NOP wave functions in one more case

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10238 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=2ee9568b18dcacc2d9a774b3bac98ef1682fdeec

diff --git a/gl_rmain.c b/gl_rmain.c
index 5f4f437f6806505742be189884d8dc780950141b..1b9ed430ab4347953bb8f2ba687aa3f0f5892a31 100644 (file)
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -10307,8 +10307,6 @@ void RSurf_PrepareVerticesForBatch(int batchneed, int texturenumsurfaces, const
                        needsupdate |= BATCHNEED_VERTEXMESH_NORMAL | BATCHNEED_VERTEXMESH_VECTOR;
                        break;
                case Q3DEFORM_WAVE:
-                       if(!R_TestQ3WaveFunc(deform->wavefunc, deform->waveparms))
-                               break; // if wavefunc is a nop, ignore this transform
                        batchneed |= BATCHNEED_ARRAY_VERTEX | BATCHNEED_ARRAY_NORMAL | BATCHNEED_ARRAY_TEXCOORD | BATCHNEED_NOGAPS;
                        needsupdate |= BATCHNEED_VERTEXPOSITION | BATCHNEED_VERTEXMESH_VERTEX | BATCHNEED_VERTEXMESH_NORMAL | BATCHNEED_VERTEXMESH_VECTOR;
                        break;
@@ -10317,8 +10315,6 @@ void RSurf_PrepareVerticesForBatch(int batchneed, int texturenumsurfaces, const
                        needsupdate |= BATCHNEED_VERTEXPOSITION | BATCHNEED_VERTEXMESH_VERTEX | BATCHNEED_VERTEXMESH_NORMAL | BATCHNEED_VERTEXMESH_VECTOR;
                        break;
                case Q3DEFORM_MOVE:
-                       if(!R_TestQ3WaveFunc(deform->wavefunc, deform->waveparms))
-                               break; // if wavefunc is a nop, ignore this transform
                        batchneed |= BATCHNEED_ARRAY_VERTEX | BATCHNEED_NOGAPS;
                        needsupdate |= BATCHNEED_VERTEXPOSITION | BATCHNEED_VERTEXMESH_VERTEX;
                        break;