Merge remote-tracking branch 'origin/master' into blender2.8
[blender.git] / source / blender / editors / interface / interface_eyedropper_color.c
index 5eb4359607a43919dedc2529fe565e6fc76576f0..bcce70d9d8a6df30ca2b20e26661003e292740ea 100644 (file)
@@ -137,8 +137,8 @@ void eyedropper_color_sample_fl(bContext *C, int mx, int my, float r_col[3])
 {
        /* we could use some clever */
        Main *bmain = CTX_data_main(C);
-       wmWindow *win = CTX_wm_window(C);
-       ScrArea *sa = BKE_screen_find_area_xy(win->screen, SPACE_TYPE_ANY, mx, my);
+       bScreen *screen = CTX_wm_screen(C);
+       ScrArea *sa = BKE_screen_find_area_xy(screen, SPACE_TYPE_ANY, mx, my);
        const char *display_device = CTX_data_scene(C)->display_settings.display_device;
        struct ColorManagedDisplay *display = IMB_colormanagement_display_get_named(display_device);