Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Sat, 8 Jul 2017 00:08:41 +0000 (02:08 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Sat, 8 Jul 2017 00:08:41 +0000 (02:08 +0200)
1  2 
source/blender/windowmanager/intern/wm_playanim.c

index 445516ffda74d72f1f95de6034569aed5b99d0df,0a6e329a7c10c9d2f8e73234ebf2562785874be7..e2e0d7dd4509556df18bc801d2f978dd851686e6
@@@ -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);