diff options
| author | Tim Angus <tim@ngus.net> | 2005-12-29 00:58:58 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2005-12-29 00:58:58 +0000 |
| commit | b128225d7083486ed1566de5a76e602baeecc8a5 (patch) | |
| tree | d447b04f9b2ccd0ac21e74b256e33c322abc9725 /src/renderer | |
| parent | 4f03afa80f3c26996b750c69781c00b0e7c2058f (diff) | |
* Merged ioq3-r451 into trunk
Diffstat (limited to 'src/renderer')
| -rw-r--r-- | src/renderer/qgl.h | 2 | ||||
| -rw-r--r-- | src/renderer/tr_bsp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/renderer/qgl.h b/src/renderer/qgl.h index b9d8d3a2..e1945f8b 100644 --- a/src/renderer/qgl.h +++ b/src/renderer/qgl.h @@ -43,7 +43,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #endif #include <windows.h> -#include <gl/gl.h> +#include <GL/gl.h> #elif defined(MACOS_X) diff --git a/src/renderer/tr_bsp.c b/src/renderer/tr_bsp.c index 5cc03b04..eb57da8f 100644 --- a/src/renderer/tr_bsp.c +++ b/src/renderer/tr_bsp.c @@ -1215,7 +1215,7 @@ void R_MovePatchSurfacesToHunk(void) { Com_Memcpy( hunkgrid->widthLodError, grid->widthLodError, grid->width * 4 ); hunkgrid->heightLodError = ri.Hunk_Alloc( grid->height * 4, h_low ); - Com_Memcpy( grid->heightLodError, grid->heightLodError, grid->height * 4 ); + Com_Memcpy( hunkgrid->heightLodError, grid->heightLodError, grid->height * 4 ); R_FreeSurfaceGridMesh( grid ); |