diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-07-08 20:17:47 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-07-08 20:17:47 +0400 |
| commit | eacb31dbb2f9a181f01d2b1138754cdea386c80f (patch) | |
| tree | 78f27d4fbd1f2a5a4a4e419360f6e980cb3d52b4 /source/blender/editors/include/BIF_gl.h | |
| parent | 5e749af4295ba3120cd882f6e35b49a80292915e (diff) | |
2.5: code consistency
* Rename BIF_transform/retopo.h to ED_transform/retopo.h
for consistency.
* Move MESH_OT_duplicate_add to editmesh_add.c.
* Remove some code from BIF_gl.h which is not needed there
anymore.
Diffstat (limited to 'source/blender/editors/include/BIF_gl.h')
| -rw-r--r-- | source/blender/editors/include/BIF_gl.h | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/source/blender/editors/include/BIF_gl.h b/source/blender/editors/include/BIF_gl.h index c1b3b056d62..3318d869378 100644 --- a/source/blender/editors/include/BIF_gl.h +++ b/source/blender/editors/include/BIF_gl.h @@ -31,30 +31,11 @@ #ifndef BIF_GL_H #define BIF_GL_H - /* Although not really a great idea to copy these defines - * from Windows' winnt.h, this lets us use GL without including - * windows.h everywhere (or BLI_winstuff.h) which is a good thing. - */ -#ifdef WIN32 -#ifndef APIENTRY -#define APIENTRY __stdcall -#endif - -#ifndef CALLBACK -#define CALLBACK __stdcall -#endif - -#ifndef WINGDIAPI -#define WINGDIAPI __declspec(dllimport) -#endif -#endif - #include "GL/glew.h" /* * these should be phased out. cpack should be replaced in - * code with calls to glColor3ub, lrectwrite probably should - * change to a function. - zr + * code with calls to glColor3ub. - zr */ /* * @@ -67,11 +48,5 @@ #define glMultMatrixf(x) glMultMatrixf( (float *)(x)) #define glLoadMatrixf(x) glLoadMatrixf( (float *)(x)) -#define lrectwrite(a, b, c, d, rect) {glRasterPos2i(a, b);glDrawPixels((c)-(a)+1, (d)-(b)+1, GL_RGBA, GL_UNSIGNED_BYTE, rect);} - -/* glStippleDefines, defined in glutil.c */ -extern GLubyte stipple_halftone[128]; -extern GLubyte stipple_quarttone[128]; - #endif /* #ifdef BIF_GL_H */ |