Merge branch 'blender-v2.81-release'

3 files changed, 7 insertions, 6 deletions

diff --git a/source/blender/editors/include/ED_fileselect.h b/source/blender/editors/include/ED_fileselect.h
index 85b9cf46574..48d256476e0 100644
--- a/source/blender/editors/include/ED_fileselect.h
+++ b/source/blender/editors/include/ED_fileselect.h
@@ -31,6 +31,7 @@ struct SpaceFile;
 struct bContext;
 struct bScreen;
 struct uiBlock;
+struct wmWindow;
 struct wmWindowManager;
 
 #define FILE_LAYOUT_HOR 1
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index 3abb3d8bfac..98cd964d02e 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -110,8 +110,8 @@ int WM_window_pixels_x(const struct wmWindow *win);
 int WM_window_pixels_y(const struct wmWindow *win);
 void WM_window_rect_calc(const struct wmWindow *win, struct rcti *r_rect);
 void WM_window_screen_rect_calc(const struct wmWindow *win, struct rcti *r_rect);
-bool WM_window_is_fullscreen(struct wmWindow *win);
-bool WM_window_is_maximized(struct wmWindow *win);
+bool WM_window_is_fullscreen(const struct wmWindow *win);
+bool WM_window_is_maximized(const struct wmWindow *win);
 
 void WM_windows_scene_data_sync(const ListBase *win_lb, struct Scene *scene) ATTR_NONNULL();
 struct Scene *WM_windows_scene_get_from_screen(const struct wmWindowManager *wm,
@@ -165,7 +165,7 @@ struct wmWindow *WM_window_open_temp(struct bContext *C,
                                      int sizey,
                                      int space_type,
                                      bool dialog);
-void WM_window_set_dpi(wmWindow *win);
+void WM_window_set_dpi(const wmWindow *win);
 
 bool WM_stereo3d_enabled(struct wmWindow *win, bool only_fullscreen_test);
 
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index 020589dcf3d..937cc8e7467 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -494,7 +494,7 @@ void wm_window_title(wmWindowManager *wm, wmWindow *win)
   }
 }
 
-void WM_window_set_dpi(wmWindow *win)
+void WM_window_set_dpi(const wmWindow *win)
 {
   float auto_dpi = GHOST_GetDPIHint(win->ghostwin);
 
@@ -2186,12 +2186,12 @@ void WM_window_screen_rect_calc(const wmWindow *win, rcti *r_rect)
   *r_rect = screen_rect;
 }
 
-bool WM_window_is_fullscreen(wmWindow *win)
+bool WM_window_is_fullscreen(const wmWindow *win)
 {
   return win->windowstate == GHOST_kWindowStateFullScreen;
 }
 
-bool WM_window_is_maximized(wmWindow *win)
+bool WM_window_is_maximized(const wmWindow *win)
 {
   return win->windowstate == GHOST_kWindowStateMaximized;
 }