r_showsurfaces + r_glsl_skeletal doesn't work currently, so blacklist the combination...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11887 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=b8dd38bb131800a9f7676d7f9cb739bed1717649

diff --git a/gl_rmain.c b/gl_rmain.c
index 06922c1da0872e3a2699515e5cf14ed6fa9884d9..96781c8f42f34d79986ec4d57bff82744a018ba9 100644 (file)
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -4802,7 +4802,7 @@ qboolean R_AnimCache_GetEntity(entity_render_t *ent, qboolean wantnormals, qbool
                if (!model || !model->Draw || !model->surfmesh.isanimated || !model->AnimateVertices)
                        return false;
                // skip entity if the shader backend has a cheaper way
-               if (model->surfmesh.data_skeletalindex4ub && r_glsl_skeletal.integer)
+               if (model->surfmesh.data_skeletalindex4ub && r_glsl_skeletal.integer && !r_showsurfaces.integer) // FIXME add r_showsurfaces support to GLSL skeletal!
                {
                        switch (vid.renderpath)
                        {