Merged changes in the trunk up to revision 32886.

source/blender/python/intern/bpy.c

@@ -38,7 +38,7 @@
 #include "BKE_utildefines.h"
 
  /* external util modules */
-#include "../generic/geometry.h"
+#include "../generic/mathutils.h"
 #include "../generic/bgl.h"
 #include "../generic/blf_api.h"
 #include "../generic/IDProp.h"
@@ -197,13 +197,7 @@ void BPy_init_modules( void )
 		printf("bpy: couldnt find 'scripts/modules', blender probably wont start.\n");
 	}
 	/* stand alone utility modules not related to blender directly */
-	Geometry_Init();
-	Mathutils_Init();
-	Noise_Init();
-	BGL_Init();
-	BLF_Init();
-	IDProp_Init_Types();
-	AUD_initPython();
+	IDProp_Init_Types(); /* not actually a submodule, just types */
 	Freestyle_Init();
 
 	mod = PyModule_New("_bpy");