Commit: 1fcce18dbf6de5c4c79cbc0d83211c5b3511d32e Author: Campbell Barton Date: Thu May 1 07:38:14 2014 +1000 https://developer.blender.org/rB1fcce18dbf6de5c4c79cbc0d83211c5b3511d32e
Another issue with includes OSX needs userdef for pixelsize, adjusted header to avoid this happening again. =================================================================== M source/blender/editors/gpencil/drawgpencil.c M source/blender/editors/include/BIF_gl.h =================================================================== diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c index 2a6dcd9..38dd904 100644 --- a/source/blender/editors/gpencil/drawgpencil.c +++ b/source/blender/editors/gpencil/drawgpencil.c @@ -44,6 +44,7 @@ #include "DNA_screen_types.h" #include "DNA_space_types.h" #include "DNA_view3d_types.h" +#include "DNA_userdef_types.h" #include "BKE_context.h" #include "BKE_global.h" diff --git a/source/blender/editors/include/BIF_gl.h b/source/blender/editors/include/BIF_gl.h index a3d3d8f..477a7c0 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 /* _______________________________________________ Bf-blender-cvs mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-blender-cvs
