Commit: d4ca74c227ee3d86d659e1a084c6ece6433def49
Author: Campbell Barton
Date: Thu Sep 10 03:54:40 2015 +1000
Branches: master
https://developer.blender.org/rBd4ca74c227ee3d86d659e1a084c6ece6433def49
bgl: disable some defines not found in mesa 7
===================================================================
M source/blender/python/generic/bgl.c
===================================================================
diff --git a/source/blender/python/generic/bgl.c
b/source/blender/python/generic/bgl.c
index 0c5cc07..137fa24 100644
--- a/source/blender/python/generic/bgl.c
+++ b/source/blender/python/generic/bgl.c
@@ -3258,7 +3258,6 @@ PyObject *BPyInit_bgl(void)
PY_DICT_ADD_INT(GL_SLUMINANCE_ALPHA);
}
-
/* GL_VERSION_3_0 */
{
PY_DICT_ADD_INT(GL_BGRA_INTEGER);
@@ -3274,21 +3273,31 @@ PyObject *BPyInit_bgl(void)
PY_DICT_ADD_INT(GL_CLIP_DISTANCE3);
PY_DICT_ADD_INT(GL_CLIP_DISTANCE4);
PY_DICT_ADD_INT(GL_CLIP_DISTANCE5);
+#if 0
PY_DICT_ADD_INT(GL_CLIP_DISTANCE6);
PY_DICT_ADD_INT(GL_CLIP_DISTANCE7);
+#endif
PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT0);
PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT1);
+ PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT2);
+ PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT3);
+ PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT4);
+ PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT5);
+ PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT6);
+ PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT7);
+ PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT8);
+ PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT9);
PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT10);
PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT11);
PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT12);
PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT13);
PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT14);
PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT15);
+#if 0
PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT16);
PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT17);
PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT18);
PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT19);
- PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT2);
PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT20);
PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT21);
PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT22);
@@ -3299,15 +3308,9 @@ PyObject *BPyInit_bgl(void)
PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT27);
PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT28);
PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT29);
- PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT3);
PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT30);
PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT31);
- PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT4);
- PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT5);
- PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT6);
- PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT7);
- PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT8);
- PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT9);
+#endif
PY_DICT_ADD_INT(GL_COMPARE_REF_TO_TEXTURE);
PY_DICT_ADD_INT(GL_COMPRESSED_RED);
PY_DICT_ADD_INT(GL_COMPRESSED_RED_RGTC1);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
