From: havoc Date: Wed, 22 Jan 2020 07:21:11 +0000 (+0000) Subject: Disable combining of surfaces in R_PolygonBegin, it makes assumptions that break... X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1890125248366989ff299dfca7f36e55d95bb0d2;p=xonotic%2Fdarkplaces.git Disable combining of surfaces in R_PolygonBegin, it makes assumptions that break things, and the underlying surface draw will still combine these for us (albeit more slowly). Thanks to Cloudwalk for the tip, and divVerent and others for debugging in depth. git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12502 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/clvm_cmds.c b/clvm_cmds.c index b1060a56..25f3b195 100644 --- a/clvm_cmds.c +++ b/clvm_cmds.c @@ -3316,7 +3316,7 @@ static void VM_CL_R_PolygonBegin (prvm_prog_t *prog) // we need to remember whether this is a 2D or 3D mesh we're adding to mod = draw2d ? CL_Mesh_UI() : CL_Mesh_CSQC(); prog->polygonbegin_model = mod; - Mod_Mesh_AddSurface(mod, Mod_Mesh_GetTexture(mod, texname, drawflags, TEXF_ALPHA, MATERIALFLAG_WALL | MATERIALFLAG_VERTEXCOLOR | MATERIALFLAG_ALPHAGEN_VERTEX), draw2d); + Mod_Mesh_AddSurface(mod, Mod_Mesh_GetTexture(mod, texname, drawflags, TEXF_ALPHA, MATERIALFLAG_WALL | MATERIALFLAG_VERTEXCOLOR | MATERIALFLAG_ALPHAGEN_VERTEX), false); } //void(vector org, vector texcoords, vector rgb, float alpha) R_PolygonVertex