Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 12 Dec 2017 02:55:09 +0000 (13:55 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 12 Dec 2017 02:55:09 +0000 (13:55 +1100)
1  2 
make.bat
source/blender/editors/interface/interface_eyedropper.c
source/blender/editors/interface/interface_intern.h
source/blender/editors/interface/interface_ops.c
source/blender/editors/interface/interface_templates.c
source/blender/windowmanager/intern/wm_files.c

diff --cc make.bat
Simple merge
index e92139ada0c4ec2514f14ae58bade97f035f220f,9cf40c07c0d1b47854de73dc8a69827fff52677e..f72f67320cc821375932cc467ab820b818be5b86
@@@ -262,11 -305,12 +307,11 @@@ static void eyedropper_exit(bContext *C
   *
   * Special check for image or nodes where we MAY have HDR pixels which don't display.
   */
- static void eyedropper_color_sample_fl(bContext *C, Eyedropper *UNUSED(eye), int mx, int my, float r_col[3])
+ static void eyedropper_color_sample_fl(bContext *C, int mx, int my, float r_col[3])
  {
 -
        /* we could use some clever */
 -      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);
  
index 7c8059fcda9fc69e6b01c8c8d7b6be5a97087d59,21e6abacfec3f00aecb0d95f623e1a212dc0ff9e..6a86644da17cb5264644dacbdfb4018214351323
@@@ -1041,9 -1027,9 +1041,9 @@@ static ImBuf *blend_file_thumb(const bC
        /* gets scaled to BLEN_THUMB_SIZE */
        if (scene->camera) {
                ibuf = ED_view3d_draw_offscreen_imbuf_simple(
 -                      scene, scene->camera,
 +                      &eval_ctx, scene, view_layer, scene->camera,
                        BLEN_THUMB_SIZE * 2, BLEN_THUMB_SIZE * 2,
-                       IB_rect, OB_SOLID, V3D_OFSDRAW_NONE, R_ALPHAPREMUL, 0, NULL,
+                       IB_rect, V3D_OFSDRAW_NONE, OB_SOLID, R_ALPHAPREMUL, 0, NULL,
                        NULL, NULL, err_out);
        }
        else {