[Bf-blender-cvs] [41fc0a06242] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 41fc0a0624230e50ee4f8521915e093d1dee0bf2
Author: Campbell Barton
Date:   Tue Dec 12 13:55:09 2017 +1100
Branches: blender2.8
https://developer.blender.org/rB41fc0a0624230e50ee4f8521915e093d1dee0bf2

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc source/blender/editors/interface/interface_eyedropper.c
index e92139ada0c,9cf40c07c0d..f72f67320cc
--- a/source/blender/editors/interface/interface_eyedropper.c
+++ b/source/blender/editors/interface/interface_eyedropper.c
@@@ -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);
  
diff --cc source/blender/windowmanager/intern/wm_files.c
index 7c8059fcda9,21e6abacfec..6a86644da17
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@@ -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 {