[Bf-blender-cvs] [bc7a4d5bad8] greasepencil-object: Merge branch 'master' into greasepencil-object

[Antonio Vazquez]

Commit: bc7a4d5bad84ed46e5fd2480a863315506a471f3
Author: Antonio Vazquez
Date:   Wed Feb 5 11:31:10 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rBbc7a4d5bad84ed46e5fd2480a863315506a471f3

Merge branch 'master' into greasepencil-object

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



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

diff --cc source/blender/editors/interface/interface_eyedropper_gpencil_color.c
index d4a1e0921c8,51467ae9695..3acae220a54
--- a/source/blender/editors/interface/interface_eyedropper_gpencil_color.c
+++ b/source/blender/editors/interface/interface_eyedropper_gpencil_color.c
@@@ -112,12 -108,28 +112,12 @@@ static void eyedropper_add_material
    Object *ob = CTX_data_active_object(C);
    Material *ma = NULL;
  
 -  const bool only_stroke = ((!event->ctrl) && (!event->shift));
 -  const bool only_fill = ((!event->ctrl) && (event->shift));
 -  const bool both = ((event->ctrl) && (event->shift));
 -
 -  float col_conv[4];
    bool found = false;
  
 -  /* 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);
 -  }
 -
    /* Look for a similar material in grease pencil slots. */
-   short *totcol = give_totcolp(ob);
+   short *totcol = BKE_object_material_num(ob);
    for (short i = 0; i < *totcol; i++) {
-     ma = give_current_material(ob, i + 1);
+     ma = BKE_object_material_get(ob, i + 1);
      if (ma == NULL) {
        continue;
      }