[Bf-blender-cvs] [0e70feab22f] blender2.8: Merge branch 'master' into blender2.8

[Bastien Montagne]

Commit: 0e70feab22fd0871d61a03b43c591fb300990de7
Author: Bastien Montagne
Date:   Mon Oct 22 10:55:16 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB0e70feab22fd0871d61a03b43c591fb300990de7

Merge branch 'master' into blender2.8

Conflicts:
	source/blender/windowmanager/intern/wm_init_exit.c

===================================================================



===================================================================

diff --cc source/blender/windowmanager/intern/wm_init_exit.c
index 719544403dd,d254a83fcc2..fb7b6078c5f
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@@ -235,14 -187,12 +235,17 @@@ void WM_init(bContext *C, int argc, con
  	ED_file_init();         /* for fsmenu */
  	ED_node_init_butfuncs();
  
 -	BLF_init(); /* Please update source/gamengine/GamePlayer/GPG_ghost.cpp if you change this */
 +	BLF_init();
+ 
  	BLT_lang_init();
+ 	/* Must call first before doing any .blend file reading, since versionning code may create new IDs... See T57066. */
+ 	BLT_lang_set(NULL);
  
 +	/* Init icons before reading .blend files for preview icons, which can
 +	 * get triggered by the depsgraph. This is also done in background mode
 +	 * for scripts that do background processing with preview icons. */
 +	BKE_icons_init(BIFICONID_LAST);
 +
  	/* reports cant be initialized before the wm,
  	 * but keep before file reading, since that may report errors */
  	wm_init_reports(C);