[Bf-blender-cvs] [6844b02] master: Fix for building w/ Python3.6
Campbell Barton
noreply at git.blender.org
Sat Sep 19 09:55:22 CEST 2015
Commit: 6844b02a71bd9d84af5bdbcb32eb49ea6ac552e7
Author: Campbell Barton
Date: Sat Sep 19 17:44:44 2015 +1000
Branches: master
https://developer.blender.org/rB6844b02a71bd9d84af5bdbcb32eb49ea6ac552e7
Fix for building w/ Python3.6
===================================================================
M release/scripts/addons
M source/blender/python/generic/py_capi_utils.c
===================================================================
diff --git a/release/scripts/addons b/release/scripts/addons
index 3fc5b82..4ac0fa2 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 3fc5b82c6bdba2f9c954fbf497621b9bb794a1bc
+Subproject commit 4ac0fa2ac50863f4884b1ee0003a37c50fa93329
diff --git a/source/blender/python/generic/py_capi_utils.c b/source/blender/python/generic/py_capi_utils.c
index 9e6ffe9..cd86ed2 100644
--- a/source/blender/python/generic/py_capi_utils.c
+++ b/source/blender/python/generic/py_capi_utils.c
@@ -666,7 +666,7 @@ void PyC_SetHomePath(const char *py_path_bundle)
bool PyC_IsInterpreterActive(void)
{
- return (((PyThreadState *)_Py_atomic_load_relaxed(&_PyThreadState_Current)) != NULL);
+ return (PyThreadState_GET() != NULL);
}
/* Would be nice if python had this built in
More information about the Bf-blender-cvs
mailing list