[Bf-blender-cvs] [f6e760b1fda] greasepencil-refactor: GPencil: Change Eyedropper and Curve conversion to Linear

[Antonio Vazquez]

Commit: f6e760b1fda796666673061aa18b46efbc128d89
Author: Antonio Vazquez
Date:   Fri Dec 20 16:34:04 2019 +0100
Branches: greasepencil-refactor
https://developer.blender.org/rBf6e760b1fda796666673061aa18b46efbc128d89

GPencil: Change Eyedropper and Curve conversion to Linear

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

M	source/blender/blenkernel/intern/gpencil.c
M	source/blender/editors/interface/interface_eyedropper_gpencil_color.c

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

diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index 9b3de9f1312..8152433acfd 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -3446,7 +3446,7 @@ static void gpencil_convert_spline(Main *bmain,
       if (ob_cu->totcol > 0) {
         mat_curve = give_current_material(ob_cu, 1);
         if (mat_curve) {
-          linearrgb_to_srgb_v3_v3(mat_gp->gp_style->stroke_rgba, &mat_curve->r);
+          copy_v3_v3(mat_gp->gp_style->stroke_rgba, &mat_curve->r);
           mat_gp->gp_style->stroke_rgba[3] = mat_curve->a;
           /* Set fill and stroke depending of curve type (3D or 2D). */
           if ((cu->flag & CU_3D) || ((cu->flag & (CU_FRONT | CU_BACK)) == 0)) {
@@ -3690,7 +3690,6 @@ bool BKE_gpencil_from_image(SpaceImage *sima, bGPDframe *gpf, const float size,
     int img_x = ibuf->x;
     int img_y = ibuf->y;
 
-    // space = 0.005 pixels = image.pixels
     float color[4];
     bGPDspoint *pt;
     for (int row = 0; row < img_y; row++) {
@@ -3698,7 +3697,7 @@ bool BKE_gpencil_from_image(SpaceImage *sima, bGPDframe *gpf, const float size,
       bGPDstroke *gps = BKE_gpencil_add_stroke(gpf, 0, img_x, size * 1000);
       done = true;
       for (int col = 0; col < img_x; col++) {
-        IMB_sampleImageAtLocation(ibuf, col, row, false, color);
+        IMB_sampleImageAtLocation(ibuf, col, row, true, color);
         pt = &gps->points[col];
         pt->pressure = 1.0f;
         pt->x = col * size;
diff --git a/source/blender/editors/interface/interface_eyedropper_gpencil_color.c b/source/blender/editors/interface/interface_eyedropper_gpencil_color.c
index d4a1e0921c8..b05524a1294 100644
--- a/source/blender/editors/interface/interface_eyedropper_gpencil_color.c
+++ b/source/blender/editors/interface/interface_eyedropper_gpencil_color.c
@@ -234,16 +234,7 @@ static void eyedropper_gpencil_color_set(bContext *C, const wmEvent *event, Eyed
 
   float col_conv[4];
 
-  /* 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);
-  }
+  copy_v3_v3(col_conv, eye->color);
 
   /* Add material or Palette color*/
   if (eye->mode == 0) {