griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2017-12-04 16:51:07 +11:00
parent 705d214349 5c27523808
commit 1b2f8b2754
8 changed files with 848 additions and 626 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/python/intern/bpy_capi_utils.h
View File

@@ -24,8 +24,8 @@
* \ingroup pythonintern
*/
#ifndef __BPY_UTIL_H__
#define __BPY_UTIL_H__
#ifndef __BPY_CAPI_UTILS_H__
#define __BPY_CAPI_UTILS_H__
#if PY_VERSION_HEX < 0x03060000
# error "Python 3.6 or greater is required, you'll need to update your python."
@@ -50,4 +50,4 @@ void BPy_SetContext(struct bContext *C);
extern void bpy_context_set(struct bContext *C, PyGILState_STATE *gilstate);
extern void bpy_context_clear(struct bContext *C, PyGILState_STATE *gilstate);
#endif /* __BPY_UTIL_H__ */
#endif /* __BPY_CAPI_UTILS_H__ */