[Bf-blender-cvs] [97c3f4a] temp-python-bgl: Merge branch 'master' into temp-python-bgl

[Campbell Barton]

Commit: 97c3f4ab2aefb341e3b90283f9d5198257c35e8a
Author: Campbell Barton
Date:   Fri Jul 24 09:47:33 2015 +1000
Branches: temp-python-bgl
https://developer.blender.org/rB97c3f4ab2aefb341e3b90283f9d5198257c35e8a

Merge branch 'master' into temp-python-bgl

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



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

diff --cc source/blender/python/generic/bgl.c
index 4f51d65,700b821..ade7af7
--- a/source/blender/python/generic/bgl.c
+++ b/source/blender/python/generic/bgl.c
@@@ -1637,8 -1425,9 +1637,8 @@@ BGLU_Wrap(UnProject,         GLint
  /** \name Module Definition
   * \{ */
  
- #define MethodDefu(func) {"glu"#func, Method_##func, METH_VARARGS, "no string"}
 -#define MethodDef(func) {"gl"#func, Method_##func, METH_VARARGS, NULL}
+ #define MethodDefu(func) {"glu"#func, Method_##func, METH_VARARGS, NULL}
 -/* So that MethodDef(Accum) becomes:
 +/* So that MethodDefu(Accum) becomes:
   * {"glAccum", Method_Accumfunc, METH_VARARGS} */
  
  static struct PyMethodDef BGL_methods[] = {