merge with trunk at r21785, and also fixed stupid ngon normals bug

source/blender/python/generic/bpy_internal_import.c

@@ -65,6 +65,11 @@ PyObject *bpy_text_import( char *name, int *found )
 	Main *maggie= bpy_import_main;
 	
 	*found= 0;
+
+	if(!maggie) {
+		printf("ERROR: bpy_import_main_set() was not called before running python. this is a bug.\n");
+		return NULL;
+	}
 	
 	if (namelen>21-3) return NULL; /* we know this cant be importable, the name is too long for blender! */
 	
@@ -112,6 +117,11 @@ PyObject *bpy_text_reimport( PyObject *module, int *found )
 //XXX	Main *maggie= bpy_import_main ? bpy_import_main:G.main;
 	Main *maggie= bpy_import_main;
 	
+	if(!maggie) {
+		printf("ERROR: bpy_import_main_set() was not called before running python. this is a bug.\n");
+		return NULL;
+	}
+	
 	*found= 0;
 	
 	/* get name, filename from the module itself */