diff options
| author | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2014-07-04 20:38:08 +0400 |
|---|---|---|
| committer | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2014-07-04 20:38:08 +0400 |
| commit | 407a6dfdc9a10827a68cabc4e530f94b07893c70 (patch) | |
| tree | 8d534614a03f32bceed97608058bd7813179405d | |
| parent | dc627428c92aaefe2a2c88d9d2557d376040cb45 (diff) | |
#if 0'd out all of GPU_deprecated.h and turned on GPU_MANGLE_DEPRECATED by default.
Will add functions and symbols back as work progresses.
Since bgl.c uses OpenGL directly like source/blender/gpu, it disables GPU_MANGLE_DEPRECATED.
| -rw-r--r-- | source/blender/gpu/GPU_deprecated.h | 2 | ||||
| -rw-r--r-- | source/blender/gpu/GPU_glew.h | 2 | ||||
| -rw-r--r-- | source/blender/python/generic/bgl.c | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/gpu/GPU_deprecated.h b/source/blender/gpu/GPU_deprecated.h index 7fbf9ef36c3..50ac28c337c 100644 --- a/source/blender/gpu/GPU_deprecated.h +++ b/source/blender/gpu/GPU_deprecated.h @@ -32,6 +32,7 @@ * \ingroup gpu */ +#if 0 #undef glBegin #define glBegin DO_NOT_USE_glBegin #undef glEnd @@ -646,5 +647,6 @@ #define glLineWidth DO_NOT_USE_glLineWidth #undef GL_LINE_SMOOTH #define GL_LINE_SMOOTH DO_NOT_USE_GL_LINE_SMOOTH +#endif #endif /* _GPU_DEPRECATED_H_ */ diff --git a/source/blender/gpu/GPU_glew.h b/source/blender/gpu/GPU_glew.h index fdcac7d8513..88263808abe 100644 --- a/source/blender/gpu/GPU_glew.h +++ b/source/blender/gpu/GPU_glew.h @@ -37,7 +37,7 @@ #ifndef GPU_MANGLE_DEPRECATED -#define GPU_MANGLE_DEPRECATED 0 +#define GPU_MANGLE_DEPRECATED 1 #endif #if GPU_MANGLE_DEPRECATED diff --git a/source/blender/python/generic/bgl.c b/source/blender/python/generic/bgl.c index efe64a99ad5..d18720598d1 100644 --- a/source/blender/python/generic/bgl.c +++ b/source/blender/python/generic/bgl.c @@ -30,6 +30,8 @@ * This module is very similar to 'PyOpenGL' which could replace 'bgl' one day. */ +#define GPU_MANGLE_DEPRECATED 0 + #include <Python.h> #include "bgl.h" /*This must come first */ |