← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to source/blender/editors/include/BIF_gl.h

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/editors/include/BIF_gl.h
35
35
 
36
36
#include "GL/glew.h"
37
37
 
38
 
        /*
39
 
         * these should be phased out. cpack should be replaced in
40
 
         * code with calls to glColor3ub. - zr
41
 
         */
 
38
#ifdef __APPLE__
 
39
 
 
40
/* hacking pointsize and linewidth */
 
41
#define glPointSize(f)  glPointSize(U.pixelsize*(f))
 
42
#define glLineWidth(f)  glLineWidth(U.pixelsize*(f))
 
43
 
 
44
#endif
 
45
 
 
46
/*
 
47
 * these should be phased out. cpack should be replaced in
 
48
 * code with calls to glColor3ub. - zr
 
49
 */
42
50
/* 
43
51
 *
44
52
 * This define converts a numerical value to the equivalent 24-bit
45
53
 * color, while not being endian-sensitive. On little-endians, this
46
54
 * is the same as doing a 'naive' indexing, on big-endian, it is not!
47
55
 * */
48
 
#define cpack(x)        glColor3ub( ((x)&0xFF), (((x)>>8)&0xFF), (((x)>>16)&0xFF) )
49
 
 
50
 
#define glMultMatrixf(x)                glMultMatrixf( (float *)(x))
51
 
#define glLoadMatrixf(x)                glLoadMatrixf( (float *)(x))
 
56
#define cpack(x)    glColor3ub( ((x) & 0xFF), (((x) >> 8) & 0xFF), (((x) >> 16) & 0xFF) )
 
57
 
 
58
#define glMultMatrixf(x)  glMultMatrixf( (float *)(x))
 
59
#define glLoadMatrixf(x)  glLoadMatrixf( (float *)(x))
 
60
 
 
61
#define GLA_PIXEL_OFS 0.375f
52
62
 
53
63
#endif /* #ifdef __BIF_GL_H__ */
54
64