blender
/
blender
132
398
Fork 577
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Another issue with includes 

OSX needs userdef for pixelsize, adjusted header to avoid this happening again.
This commit is contained in:
Campbell Barton 2014-05-01 07:38:14 +10:00
parent af86b008b2
commit 1fcce18dbf
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/editors/gpencil/drawgpencil.c
View File

@ -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"

9
source/blender/editors/include/BIF_gl.h
View File

@ -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
/*