Revision: 48037
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48037
Author: nazgul
Date: 2012-06-18 13:46:57 +0000 (Mon, 18 Jun 2012)
Log Message:
-----------
Reverting changes made in r48030 by Campbell's request
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48030
Modified Paths:
--------------
trunk/blender/source/blender/python/generic/py_capi_utils.c
Modified: trunk/blender/source/blender/python/generic/py_capi_utils.c
===================================================================
--- trunk/blender/source/blender/python/generic/py_capi_utils.c 2012-06-18
13:13:11 UTC (rev 48036)
+++ trunk/blender/source/blender/python/generic/py_capi_utils.c 2012-06-18
13:46:57 UTC (rev 48037)
@@ -384,10 +384,7 @@
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))) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs