Merged changes in the trunk up to revision 42116.
[blender.git] / source / blender / python / intern / bpy_interface.c
index 73dcbdaca559e8aa4334029e1109b6c17072964f..b7ead49633c71490c64d2cfe5af1dff6b0a4c96d 100644 (file)
 
 /** \file blender/python/intern/bpy_interface.c
  *  \ingroup pythonintern
+ *
+ * This file deals with embedding the python interpreter within blender,
+ * starting and stopping python and exposing blender/python modules so they can
+ * be accesses from scripts.
  */
 
  
@@ -183,7 +187,7 @@ static struct _inittab bpy_internal_modules[]= {
        {(char *)"aud", AUD_initPython},
 #endif
 #ifdef WITH_CYCLES
-       {(char *)"libcycles_blender", CYCLES_initPython},
+       {(char *)"bcycles", CYCLES_initPython},
 #endif
        {(char *)"gpu", GPU_initPython},
        {NULL, NULL}
@@ -196,7 +200,7 @@ void BPY_python_start(int argc, const char **argv)
        PyThreadState *py_tstate= NULL;
 
        /* not essential but nice to set our name */
-       static wchar_t program_path_wchar[FILE_MAXDIR+FILE_MAXFILE]; /* python holds a reference */
+       static wchar_t program_path_wchar[FILE_MAX]; /* python holds a reference */
        BLI_strncpy_wchar_from_utf8(program_path_wchar, BLI_program_path(), sizeof(program_path_wchar) / sizeof(wchar_t));
        Py_SetProgramName(program_path_wchar);