diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-12-04 08:51:07 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-12-04 08:51:07 +0300 |
commit | 1b2f8b27540f6154dc968f216297ab9badccd271 (patch) | |
tree | aa85314a8fd56db3e235df644f8e4e35386138cb /source/blender/python | |
parent | 705d214349ef480e94461eb9ac0499a9f2beafc1 (diff) | |
parent | 5c2752380883d8f2e6655bd5397871f049ee8bbb (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/python')
-rw-r--r-- | source/blender/python/intern/bpy_capi_utils.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/python/intern/bpy_capi_utils.h b/source/blender/python/intern/bpy_capi_utils.h index 171c46d8e86..abb37d6e30c 100644 --- a/source/blender/python/intern/bpy_capi_utils.h +++ b/source/blender/python/intern/bpy_capi_utils.h @@ -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__ */ |