[Bf-blender-cvs] [e6b9e248efb] greasepencil-object: GPencil: Fix eyedropper color conversion

[Antonio Vazquez]

Commit: e6b9e248efb379bb7450ba78633378f7769a964d
Author: Antonio Vazquez
Date:   Tue Feb 18 13:47:35 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rBe6b9e248efb379bb7450ba78633378f7769a964d

GPencil: Fix eyedropper color conversion

This was removed by error.

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

M	source/blender/editors/interface/interface_eyedropper_gpencil_color.c

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

diff --git a/source/blender/editors/interface/interface_eyedropper_gpencil_color.c b/source/blender/editors/interface/interface_eyedropper_gpencil_color.c
index f62efcfc766..99668cf67f7 100644
--- a/source/blender/editors/interface/interface_eyedropper_gpencil_color.c
+++ b/source/blender/editors/interface/interface_eyedropper_gpencil_color.c
@@ -234,7 +234,16 @@ static void eyedropper_gpencil_color_set(bContext *C, const wmEvent *event, Eyed
 
   float col_conv[4];
 
-  copy_v3_v3(col_conv, eye->color);
+  /* Convert from linear rgb space to display space because grease pencil colors are in display
+   *  space, and this conversion is needed to undo the conversion to linear performed by
+   *  eyedropper_color_sample_fl. */
+  if (eye->display) {
+    copy_v3_v3(col_conv, eye->color);
+    IMB_colormanagement_scene_linear_to_display_v3(col_conv, eye->display);
+  }
+  else {
+    copy_v3_v3(col_conv, eye->color);
+  }
 
   /* Add material or Palette color*/
   if (eye->mode == 0) {