okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'HEAD' of https://github.com/ioquake/ioq3.git into suntest

Browse source
This commit is contained in:
SmileTheory 2013-04-02 00:18:24 -07:00
commit 6a763f0671
35 changed files with 106 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

3
code/renderergl2/tr_bsp.c
View file

@ -2123,8 +2123,6 @@ static void R_CreateWorldVBO(void)
}
startTime = ri.Milliseconds();
ri.Free(surfacesSorted);
ri.Hunk_FreeTempMemory(triangles);
@ -2151,7 +2149,6 @@ static void R_LoadSurfaces( lump_t *surfs, lump_t *verts, lump_t *indexLump ) {
numTriSurfs = 0;
numFlares = 0;
in = (void *)(fileBase + surfs->fileofs);
if (surfs->filelen % sizeof(*in))
ri.Error (ERR_DROP, "LoadMap: funny lump size in %s",s_worldData.name);
count = surfs->filelen / sizeof(*in);