diff options
| -rw-r--r-- | extern/mantaflow/helper/pwrapper/pconvert.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/extern/mantaflow/helper/pwrapper/pconvert.cpp b/extern/mantaflow/helper/pwrapper/pconvert.cpp index c8c92cbf585..9ada75519fc 100644 --- a/extern/mantaflow/helper/pwrapper/pconvert.cpp +++ b/extern/mantaflow/helper/pwrapper/pconvert.cpp @@ -144,7 +144,12 @@ template<> int fromPy<int>(PyObject *obj) template<> string fromPy<string>(PyObject *obj) { if (PyUnicode_Check(obj)) +#ifdef BLENDER + // Blender is completely UTF-8 based + return PyBytes_AsString(PyUnicode_AsUTF8String(obj)); +#else return PyBytes_AsString(PyUnicode_AsLatin1String(obj)); +#endif #if PY_MAJOR_VERSION <= 2 else if (PyString_Check(obj)) return PyString_AsString(obj); @@ -155,7 +160,12 @@ template<> string fromPy<string>(PyObject *obj) template<> const char *fromPy<const char *>(PyObject *obj) { if (PyUnicode_Check(obj)) +#ifdef BLENDER + // Blender is completely UTF-8 based + return PyBytes_AsString(PyUnicode_AsUTF8String(obj)); +#else return PyBytes_AsString(PyUnicode_AsLatin1String(obj)); +#endif #if PY_MAJOR_VERSION <= 2 else if (PyString_Check(obj)) return PyString_AsString(obj); |