From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Fri, 25 Jan 2013 19:59:31 +0000 (+0000)
Subject: r_showsurfaces + r_glsl_skeletal doesn't work currently, so blacklist the combination... 
X-Git-Tag: xonotic-v0.8.0~96^2~152
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b8dd38bb131800a9f7676d7f9cb739bed1717649;p=xonotic%2Fdarkplaces.git

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

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11887 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/gl_rmain.c b/gl_rmain.c
index 06922c1d..96781c8f 100644
--- 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)
 			{