[Bf-blender-cvs] [407a6df] soc-2014-viewport_fx: #if 0'd out all of GPU_deprecated.h and turned on GPU_MANGLE_DEPRECATED by default.

[Jason Wilkins]

Commit: 407a6dfdc9a10827a68cabc4e530f94b07893c70
Author: Jason Wilkins
Date:   Fri Jul 4 11:38:08 2014 -0500
https://developer.blender.org/rB407a6dfdc9a10827a68cabc4e530f94b07893c70

#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.

===================================================================

M	source/blender/gpu/GPU_deprecated.h
M	source/blender/gpu/GPU_glew.h
M	source/blender/python/generic/bgl.c

===================================================================

diff --git a/source/blender/gpu/GPU_deprecated.h b/source/blender/gpu/GPU_deprecated.h
index 7fbf9ef..50ac28c 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 fdcac7d..8826380 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 efe64a9..d187205 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 */