Merge branch 'master' into blender2.8

2017-03-25 13:49:13 +11:00
parent edd2c556cd 7cb2974182
commit f730e386eb
28 changed files with 1247 additions and 150 deletions
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -193,7 +193,7 @@ void WM_init(bContext *C, int argc, const char **argv)
 	wm_init_reports(C);

 	/* get the default database, plus a wm */
-	wm_homefile_read(C, NULL, G.factory_startup, NULL);
+	wm_homefile_read(C, NULL, G.factory_startup, NULL, NULL);
 	

 	BLT_lang_set(NULL);