svn merge -r38000:38200 https://svn.blender.org/svnroot/bf-blender/trunk/blender

source/blender/python/intern/bpy_interface.c

@@ -209,8 +209,6 @@ void BPY_python_start(int argc, const char **argv)
 
 	Py_Initialize();
 
-	bpy_intern_string_init();
-
 	// PySys_SetArgv(argc, argv); // broken in py3, not a huge deal
 	/* sigh, why do python guys not have a char** version anymore? :( */
 	{
@@ -233,6 +231,8 @@ void BPY_python_start(int argc, const char **argv)
 	PyImport_ExtendInittab(bpy_internal_modules);
 #endif
 
+	bpy_intern_string_init();
+
 	/* bpy.* and lets us import it */
 	BPy_init_modules();