Cycles: svn merge -r41182:41205 ^/trunk/blender

[blender-staging.git] / source / blender / python / intern / bpy_interface.c

diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c
index a937dcb1c89734c168409bb67298504767ab48d2..d8a6b192a23d61ef988beb91d3ec1c5e659dba6f 100644 (file)
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -208,9 +208,9 @@ void BPY_python_start(int argc, const char **argv)
        /* allow to use our own included python */
        PyC_SetHomePath(BLI_get_folder(BLENDER_SYSTEM_PYTHON, NULL));
 
-       /* Python 3.2 now looks for '2.58/python/include/python3.2d/pyconfig.h' to parse
-        * from the 'sysconfig' module which is used by 'site', so for now disable site.
-        * alternatively we could copy the file. */
+       /* Python 3.2 now looks for '2.xx/python/include/python3.2d/pyconfig.h' to
+        * parse from the 'sysconfig' module which is used by 'site',
+        * so for now disable site. alternatively we could copy the file. */
        Py_NoSiteFlag= 1;
 
        Py_Initialize();
@@ -220,8 +220,11 @@ void BPY_python_start(int argc, const char **argv)
        {
                int i;
                PyObject *py_argv= PyList_New(argc);
-               for (i=0; i<argc; i++)
-                       PyList_SET_ITEM(py_argv, i, PyC_UnicodeFromByte(argv[i])); /* should fix bug #20021 - utf path name problems, by replacing PyUnicode_FromString */
+               for (i=0; i<argc; i++) {
+                       /* should fix bug #20021 - utf path name problems, by replacing
+                        * PyUnicode_FromString, with this one */
+                       PyList_SET_ITEM(py_argv, i, PyC_UnicodeFromByte(argv[i]));
+               }
 
                PySys_SetObject("argv", py_argv);
                Py_DECREF(py_argv);
@@ -676,7 +679,7 @@ int BPY_context_member_get(bContext *C, const char *member, bContextDataResult *
 
 
 #ifdef WITH_PYTHON_MODULE
-#include "BLI_storage.h"
+#include "BLI_fileops.h"
 /* TODO, reloading the module isnt functional at the moment. */
 
 static void bpy_module_free(void *mod);