Scripts (making some changes to the scripts dir):

- moved bpydata/ to scripts/bpydata/ and added a config/ subdir to it;
- created scripts/bpymodules for py modules (also got rid of those "mod_"'s appended to the files);
- updated scripts accordingly.

This will require you to "reinstall" (just copy the scripts/ dir over your older one) if you have a .blender/scripts/ dir somewhere.  Otherwise some scripts won't work.  You can use the updated "Help->System->System Information" script here to check all is fine.  An installer script yet to be written will help users with these issues, specially to make the user defined dir have the same structure expected from the default scripts dir, so the basic facilities (module search; saved config data; scripts: installer, help browser, config editor) are also available for a user's own collection of written and downloaded scripts.

BPython:
- slikdigit's crash was because he had no <home or blender exe location>/.blender/:
  proper check added and also now if all else fails the <cvsblender>/release/scripts/ dir is also searched for scripts.  All this registration dirs stuff is a little messy (installation!), so please report any troubles (I only tested on linux).
- slight change in error report in BPY_interface.c's BPY_menu_do_python; remembering to set globaldict pointer to NULL there, too.
- moved bpy_gethome() to EXPP_interface.[ch]
- "//" as user defined python dir is ignored while looking for scripts, considering it's only a default some users use, not really meant for a scripts dir.

1 files changed, 68 insertions, 0 deletions

diff --git a/source/blender/python/api2_2x/EXPP_interface.c b/source/blender/python/api2_2x/EXPP_interface.c
index 2a03936c3f7..0dd363146e7 100644
--- a/source/blender/python/api2_2x/EXPP_interface.c
+++ b/source/blender/python/api2_2x/EXPP_interface.c
@@ -37,15 +37,83 @@
 #include <BKE_global.h>
 #include <BKE_library.h>
 #include <BKE_main.h>
+#include <BLI_blenlib.h>
+#include <DNA_space_types.h> /* for FILE_MAXDIR, FILE_MAXFILE */
 
 #include "EXPP_interface.h"
 #include "Blender.h"
 #include "Registry.h"
 #include "gen_utils.h"
 
+extern char bprogname[]; /* argv[0] from creator.c */
 
 void initBlenderApi2_2x( void )
 {
 	g_blenderdict = NULL;
 	M_Blender_Init(  );
 }
+
+/* this makes sure BLI_gethome() returns a path with '.blender' appended
+ * Besides, this function now either returns userhome/.blender (if it exists)
+ * or blenderInstallDir/.blender/ otherwise (can also be cvs dir).
+ * If append_scriptsdir is non NULL, "scripts/" is appended to the dir, to
+ * get the path to the scripts folder ("release/scripts/" if cvs  dir).
+ * Finally, if all else fails BLI_gethome() is returned
+ * (or NULL if append_scriptdir != 0).
+*/
+char *bpy_gethome(int append_scriptsdir)
+{
+	static char homedir[FILE_MAXDIR];
+	static char scriptsdir[FILE_MAXDIR];
+	char bprogdir[FILE_MAXDIR];
+	char *s;
+	int i;
+
+	if (append_scriptsdir) {
+		if (scriptsdir[0] != '\0')
+			return scriptsdir;
+	}
+	else if (homedir[0] != '\0')
+		return homedir;
+
+	s = BLI_gethome();
+
+	if( strstr( s, ".blender" ) )
+		PyOS_snprintf( homedir, FILE_MAXDIR, s );
+	else
+		BLI_make_file_string( "/", homedir, s, ".blender/" );
+
+	/* if userhome/.blender/ exists, return it */
+	if( BLI_exists( homedir ) ) {
+		if (append_scriptsdir) {
+			BLI_make_file_string("/", scriptsdir, homedir, "scripts/");
+			if (BLI_exists (scriptsdir)) return scriptsdir;
+		}
+		else return homedir;
+	}
+
+	/* otherwise, use argv[0] (bprogname) to get .blender/ in
+	 * Blender's installation dir */
+	s = BLI_last_slash( bprogname );
+
+	i = s - bprogname + 1;
+
+	PyOS_snprintf( bprogdir, i, bprogname );
+	BLI_make_file_string( "/", homedir, bprogdir, ".blender/" );
+
+	if (BLI_exists(homedir)) {
+		if (append_scriptsdir) {
+			BLI_make_file_string("/", scriptsdir, homedir, "scripts/");
+			if (BLI_exists(scriptsdir)) return scriptsdir;
+		}
+		else return homedir;
+	}
+
+	/* last try for scripts dir: blender in cvs dir, scripts/ inside release/: */
+	if (append_scriptsdir) {
+		BLI_make_file_string("/", scriptsdir, bprogdir, "release/scripts/");
+		if (BLI_exists(scriptsdir)) return scriptsdir;
+	}
+
+	return NULL;
+}