diff options
author | Hans Goudey <h.goudey@me.com> | 2020-09-01 20:35:14 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2020-09-01 20:38:05 +0300 |
commit | baca8611e5fe4b3dcd6f5065fb125bc0a9d65934 (patch) | |
tree | bb1230387cd53b15f9621f10c4d0e5e2050b5580 /intern/glew-mx/intern/gl-deprecated.h | |
parent | 31705201dddebf7e3be5c4533b89f380aad1ede1 (diff) | |
parent | 2930d4fcea405985f2212c5f28c061af7c4849f8 (diff) |
Merge branch 'master' into active-fcurve-keyframeactive-fcurve-keyframe
Diffstat (limited to 'intern/glew-mx/intern/gl-deprecated.h')
-rw-r--r-- | intern/glew-mx/intern/gl-deprecated.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/intern/glew-mx/intern/gl-deprecated.h b/intern/glew-mx/intern/gl-deprecated.h index b6524cd5197..d101591fea3 100644 --- a/intern/glew-mx/intern/gl-deprecated.h +++ b/intern/glew-mx/intern/gl-deprecated.h @@ -824,10 +824,12 @@ #define GL_SOURCE0_ALPHA DO_NOT_USE_GL_SOURCE0_ALPHA #undef GL_SOURCE0_RGB #define GL_SOURCE0_RGB DO_NOT_USE_GL_SOURCE0_RGB -#undef GL_SOURCE1_ALPHA -#define GL_SOURCE1_ALPHA DO_NOT_USE_GL_SOURCE1_ALPHA -#undef GL_SOURCE1_RGB -#define GL_SOURCE1_RGB DO_NOT_USE_GL_SOURCE1_RGB +#if 0 /* Those are reused as new valid enum! GL_SRC1_COLOR etc... */ +# undef GL_SOURCE1_ALPHA +# define GL_SOURCE1_ALPHA DO_NOT_USE_GL_SOURCE1_ALPHA +# undef GL_SOURCE1_RGB +# define GL_SOURCE1_RGB DO_NOT_USE_GL_SOURCE1_RGB +#endif #undef GL_SOURCE2_ALPHA #define GL_SOURCE2_ALPHA DO_NOT_USE_GL_SOURCE2_ALPHA #undef GL_SOURCE2_RGB |