diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-03-25 12:20:19 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-03-25 12:20:19 +0400 |
commit | 3b711a6ed009b35bb69cd0ca878eeb8d55fa0e77 (patch) | |
tree | b3fdb366cb49bdea5b57dfa6ba4a82635c68d0ee /source/blender/python/generic/bgl.h | |
parent | a2ebfc82dbe954acc432ae017ac62a30a11b6a16 (diff) | |
parent | e99a23fc6b33b5097eab44aac19c2a089ddebce6 (diff) |
Merged changes in the trunk up to revision 45133.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/bmesh/intern/bmesh_construct.c
source/blender/bmesh/intern/bmesh_mesh_conv.c
source/blender/bmesh/intern/bmesh_mesh_conv.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/bmesh_select.c
source/blender/editors/mesh/bmesh_tools.c
source/blender/editors/space_view3d/drawobject.c
source/blender/render/intern/source/shadeoutput.c
Diffstat (limited to 'source/blender/python/generic/bgl.h')
-rw-r--r-- | source/blender/python/generic/bgl.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/python/generic/bgl.h b/source/blender/python/generic/bgl.h index 9df08882b8a..daebd7a5194 100644 --- a/source/blender/python/generic/bgl.h +++ b/source/blender/python/generic/bgl.h @@ -44,10 +44,10 @@ PyObject *BPyInit_bgl(void); /*@ Create a buffer object */ /*@ dimensions is an array of ndimensions integers representing the size of each dimension */ /*@ initbuffer if not NULL holds a contiguous buffer with the correct format from which the buffer will be initialized */ -struct _Buffer *BGL_MakeBuffer( int type, int ndimensions, int *dimensions, void *initbuffer ); +struct _Buffer *BGL_MakeBuffer(int type, int ndimensions, int *dimensions, void *initbuffer); /*@ Return the size of buffer element, type must be one of GL_BYTE, GL_SHORT, GL_INT, GL_FLOAT or GL_DOUBLE */ /*@ returns -1 otherwise */ -int BGL_typeSize( int type ); +int BGL_typeSize(int type); /*@ Buffer Object */ /*@ For Python access to OpenGL functions requiring a pointer. */ @@ -312,23 +312,23 @@ extern PyTypeObject BGL_bufferType; #define ret_ret_void return Py_INCREF(Py_None), Py_None #define ret_def_GLint int ret_int -#define ret_set_GLint ret_int= +#define ret_set_GLint ret_int = #define ret_ret_GLint return PyLong_FromLong(ret_int) #define ret_def_GLuint unsigned int ret_uint -#define ret_set_GLuint ret_uint= +#define ret_set_GLuint ret_uint = #define ret_ret_GLuint return PyLong_FromLong((long) ret_uint) #define ret_def_GLenum unsigned int ret_uint -#define ret_set_GLenum ret_uint= +#define ret_set_GLenum ret_uint = #define ret_ret_GLenum return PyLong_FromLong((long) ret_uint) #define ret_def_GLboolean unsigned char ret_bool -#define ret_set_GLboolean ret_bool= +#define ret_set_GLboolean ret_bool = #define ret_ret_GLboolean return PyLong_FromLong((long) ret_bool) #define ret_def_GLstring const unsigned char *ret_str; -#define ret_set_GLstring ret_str= +#define ret_set_GLstring ret_str = #define ret_ret_GLstring \ if (ret_str) { \ |