diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-05-01 01:38:14 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-05-01 01:38:14 +0400 |
| commit | 1fcce18dbf6de5c4c79cbc0d83211c5b3511d32e (patch) | |
| tree | 2cc11a19bd8eb85213e46f98977c680e63bea581 /source/blender/editors/include/BIF_gl.h | |
| parent | af86b008b2a3dacc33b4987c50d8ffa24f6f9817 (diff) | |
Another issue with includes
OSX needs userdef for pixelsize, adjusted header to avoid this happening again.
Diffstat (limited to 'source/blender/editors/include/BIF_gl.h')
| -rw-r--r-- | source/blender/editors/include/BIF_gl.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/editors/include/BIF_gl.h b/source/blender/editors/include/BIF_gl.h index a3d3d8f05a2..477a7c0ce17 100644 --- a/source/blender/editors/include/BIF_gl.h +++ b/source/blender/editors/include/BIF_gl.h @@ -38,9 +38,12 @@ #ifdef __APPLE__ /* hacking pointsize and linewidth */ -#define glPointSize(f) glPointSize(U.pixelsize*(f)) -#define glLineWidth(f) glLineWidth(U.pixelsize*(f)) - +# define glPointSize(f) glPointSize(U.pixelsize * (f)) +# define glLineWidth(f) glLineWidth(U.pixelsize * (f)) +#else + /* avoid include mismatch by referencing 'U' from both */ +# define glPointSize(f) glPointSize(((void)U.pixelsize, (f))) +# define glLineWidth(f) glLineWidth(((void)U.pixelsize, (f))) #endif /* |