Bastien Montagne 346964eb3f Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/editors/gpencil/drawgpencil.c

2017-04-10 16:53:12 +02:00

..

bgl.c

OpenGL: remove packed imm mode functions from Python API

2017-03-13 14:08:03 -04:00

bgl.h

…

blf_py_api.c

BLF: make blurry text an optional (disabled) feature

2016-10-15 19:40:41 -04:00

blf_py_api.h

…

bpy_internal_import.c

…

bpy_internal_import.h

…

bpy_threads.c

Cleanup: remove _POSIX_C_SOURCE undefine

2015-10-20 14:06:29 +11:00

CMakeLists.txt

…

idprop_py_api.c

PyAPI: Fast buffer access to id property arrays

2017-04-10 21:12:02 +10:00

idprop_py_api.h

…

py_capi_utils.c

PyAPI: add BPY_execute_string_as_string

2017-03-18 12:19:03 +11:00

py_capi_utils.h

PyAPI: add BPY_execute_string_as_string

2017-03-18 12:19:03 +11:00

python_utildefines.h

…