Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 7 Jul 2017 23:02:11 +0000 (01:02 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 7 Jul 2017 23:02:11 +0000 (01:02 +0200)
12 files changed:
1  2 
source/blender/blenfont/BLF_api.h
source/blender/blenfont/intern/blf.c
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/blender.c
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/editors/screen/screen_edit.c
source/blender/render/intern/source/convertblender.c
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_init_exit.c
source/blender/windowmanager/intern/wm_window.c
source/gameengine/GamePlayer/ghost/GPG_ghost.cpp

Simple merge
Simple merge
index c97b52ae1cdd3d28c8afe657972b6f5c08b0b177,f469686b0b220a4550eb863724c85562314dc2bc..3e4b4b501cecd9d5fa8618e7b0d6db75962f284d
@@@ -923,18 -1228,19 +923,19 @@@ void ED_screen_refresh(wmWindowManager 
                winrct.ymax = winsize_y - 1;
                
                /* header size depends on DPI, let's verify */
+               WM_window_set_dpi(win);
                screen_refresh_headersizes();
                
 -              screen_test_scale(win->screen, winsize_x, winsize_y);
 +              screen_test_scale(screen, winsize_x, winsize_y);
                
 -              if (win->screen->mainwin == 0) {
 -                      win->screen->mainwin = wm_subwindow_open(win, &winrct, false);
 +              if (screen->mainwin == 0) {
 +                      screen->mainwin = wm_subwindow_open(win, &winrct, false);
                }
                else {
 -                      wm_subwindow_position(win, win->screen->mainwin, &winrct, false);
 +                      wm_subwindow_position(win, screen->mainwin, &winrct, false);
                }
                
 -              for (sa = win->screen->areabase.first; sa; sa = sa->next) {
 +              for (sa = screen->areabase.first; sa; sa = sa->next) {
                        /* set spacetype and region callbacks, calls init() */
                        /* sets subwindows for regions, adds handlers */
                        ED_area_initialize(wm, win, sa);
Simple merge
index 66df41e5b84ece0d4624d8ea6c8f53c6b560f4e3,8afeb8e7b3d156b9f3dc7d2190ffa9c8e0a7554b..8068b048d1027b647f583859355f8d643eb6b658
@@@ -1005,13 -869,10 +1007,13 @@@ void wm_window_make_drawable(wmWindowMa
                if (G.debug & G_DEBUG_EVENTS) {
                        printf("%s: set drawable %d\n", __func__, win->winid);
                }
 +
 +              immDeactivate();
                GHOST_ActivateWindowDrawingContext(win->ghostwin);
 -              
 +              immActivate();
 +
                /* this can change per window */
-               wm_window_set_dpi(win);
+               WM_window_set_dpi(win);
        }
  }
  
@@@ -1208,10 -1069,10 +1210,10 @@@ static int ghost_event_proc(GHOST_Event
  
                                /* stop screencast if resize */
                                if (type == GHOST_kEventWindowSize) {
 -                                      WM_jobs_stop(wm, win->screen, NULL);
 +                                      WM_jobs_stop(wm, WM_window_get_active_screen(win), NULL);
                                }
  
-                               wm_window_set_dpi(win);
+                               WM_window_set_dpi(win);
                                
                                /* win32: gives undefined window size when minimized */
                                if (state != GHOST_kWindowStateMinimized) {
                        {
                                // only update if the actual pixel size changes
                                float prev_pixelsize = U.pixelsize;
-                               wm_window_set_dpi(win);
+                               WM_window_set_dpi(win);
  
                                if (U.pixelsize != prev_pixelsize) {
 +                                      BKE_icon_changed(WM_window_get_active_screen(win)->id.icon_id);
 +
                                        // close all popups since they are positioned with the pixel
                                        // size baked in and it's difficult to correct them
                                        wmWindow *oldWindow = CTX_wm_window(C);