diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-01 02:09:43 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-01 02:09:43 +0400 |
| commit | 4c36a26af5d1093badc88401bfebf8454fdf0f34 (patch) | |
| tree | 2e82fc5ff893651982d20ffdd15d4c69bfcbe7b8 /source/blender/python/generic/bgl.h | |
| parent | 3b711a6ed009b35bb69cd0ca878eeb8d55fa0e77 (diff) | |
| parent | 8f949dd58decac45fd49f9a93152f2cddc98d901 (diff) | |
Merged changes in the trunk up to revision 45308.
Conflicts resolved:
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/space_view3d/drawobject.c
Diffstat (limited to 'source/blender/python/generic/bgl.h')
| -rw-r--r-- | source/blender/python/generic/bgl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/python/generic/bgl.h b/source/blender/python/generic/bgl.h index daebd7a5194..1a7036daf45 100644 --- a/source/blender/python/generic/bgl.h +++ b/source/blender/python/generic/bgl.h @@ -327,7 +327,7 @@ extern PyTypeObject BGL_bufferType; #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_def_GLstring const unsigned char *ret_str #define ret_set_GLstring ret_str = #define ret_ret_GLstring \ |