Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2012-06-18 17:46:57 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-06-18 17:46:57 +0400
commitfc5df9d634245f76009226a3eb216cb31806b709 (patch)
tree32334595c223c447d380467929f0d320c6c32964 /source/blender/python
parent2c3165fdc01092b41d14adb94073f10073ba6c3b (diff)
Reverting changes made in r48030 by Campbell's request
Diffstat (limited to 'source/blender/python')
-rw-r--r--source/blender/python/generic/py_capi_utils.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/python/generic/py_capi_utils.c b/source/blender/python/generic/py_capi_utils.c
index f487414956c..fd12f7f483d 100644
--- a/source/blender/python/generic/py_capi_utils.c
+++ b/source/blender/python/generic/py_capi_utils.c
@@ -384,10 +384,7 @@ const char *PyC_UnicodeAsByte(PyObject *py_str, PyObject **coerce)
else {
PyErr_Clear();
- if (py_str == Py_None) {
- return NULL;
- }
- else if (PyBytes_Check(py_str)) {
+ if (PyBytes_Check(py_str)) {
return PyBytes_AS_STRING(py_str);
}
else if ((*coerce = PyUnicode_EncodeFSDefault(py_str))) {