- Added user defined python dir to Python's sys.path:

    Had to add a function call to creator.c, explained in a note there (look
    for pythondir in the file)

1 files changed, 15 insertions, 0 deletions

diff --git a/source/blender/python/BPY_interface.c b/source/blender/python/BPY_interface.c
index 5a388b1ea0d..1b3ff468361 100644
--- a/source/blender/python/BPY_interface.c
+++ b/source/blender/python/BPY_interface.c
@@ -178,6 +178,9 @@ void init_syspath(void)
 
 	if (U.pythondir) { /* XXX not working, U.pythondir is NULL here ?!?*/
 					/* maybe it wasn't defined yet at this point in start-up ...*/
+					/* Update: definitely that is the reason. We need to start python
+					 * after U.pythondir is defined (better after the other U.xxxx are
+					 * too. */
 		p = Py_BuildValue("s", U.pythondir);
 		syspath_append(p);  /* append to module search path */
 	}
@@ -193,6 +196,18 @@ void init_syspath(void)
 }
 
 /*****************************************************************************/
+/* Description: This function adds the user defined folder for Python        */
+/*              scripts to sys.path.  This is done in init_syspath, too, but */
+/*              when Blender's main() runs BPY_start_python(), U.pythondir   */
+/*              isn't set yet, so we provide this function to be executed    */
+/*              after U.pythondir is defined.                                */
+/*****************************************************************************/
+void BPY_syspath_append_pythondir(void)
+{
+	syspath_append(Py_BuildValue("s", U.pythondir));
+}
+
+/*****************************************************************************/
 /* Description: This function will return the linenumber on which an error   */
 /*              has occurred in the Python script.                           */
 /*****************************************************************************/