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

[Brecht Van Lommel]

Commit: eb8c45508d59898b4b4def36f93c79ccc320e437
Author: Brecht Van Lommel
Date:   Sat Jul 8 02:08:41 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBeb8c45508d59898b4b4def36f93c79ccc320e437

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/windowmanager/intern/wm_playanim.c
index 445516ffda7,0a6e329a7c1..e2e0d7dd450
--- a/source/blender/windowmanager/intern/wm_playanim.c
+++ b/source/blender/windowmanager/intern/wm_playanim.c
@@@ -1261,11 -1255,8 +1261,11 @@@ static char *wm_main_playanim_intern(in
  
  	//GHOST_ActivateWindowDrawingContext(g_WS.ghost_window);
  
 +	/* initialize OpenGL immediate mode */
 +	immInit();
 +
  	/* initialize the font */
- 	BLF_init(11, 72);
+ 	BLF_init();
  	ps.fontid = BLF_load_mem("monospace", (unsigned char *)datatoc_bmonofont_ttf, datatoc_bmonofont_ttf_size);
  	BLF_size(ps.fontid, 11, 72);