fix for py/rna api bug:

  PyC_UnicodeAsByte(), used for getting python strings as bytes wasnt clearning utf-8 conversion errors.
  this would raise an error when getting an operators filepath.

1 files changed, 8 insertions, 5 deletions

diff --git a/source/blender/python/generic/py_capi_utils.c b/source/blender/python/generic/py_capi_utils.c
index d5bd44fc288..17fda6d08a7 100644
--- a/source/blender/python/generic/py_capi_utils.c
+++ b/source/blender/python/generic/py_capi_utils.c
@@ -363,12 +363,15 @@ const char *PyC_UnicodeAsByte(PyObject *py_str, PyObject **coerce)
 		 * chars since blender doesnt limit this */
 		return result;
 	}
-	else if(PyBytes_Check(py_str)) {
-		PyErr_Clear();
-		return PyBytes_AS_STRING(py_str);
-	}
 	else {
-		return PyBytes_AS_STRING((*coerce= PyUnicode_EncodeFSDefault(py_str)));
+		PyErr_Clear();
+
+		if(PyBytes_Check(py_str)) {
+			return PyBytes_AS_STRING(py_str);
+		}
+		else {
+			return PyBytes_AS_STRING((*coerce= PyUnicode_EncodeFSDefault(py_str)));
+		}
 	}
 }