[Bf-blender-cvs] [49152c98a58] lanpr-under-gp: Merge remote-tracking branch 'origin/master' into lanpr-under-gp

[YimingWu]

Commit: 49152c98a5800d4399ed8bc091b89d60912bbf7d
Author: YimingWu
Date:   Sat Jul 4 13:56:23 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rB49152c98a5800d4399ed8bc091b89d60912bbf7d

Merge remote-tracking branch 'origin/master' into lanpr-under-gp

# Conflicts:
#	source/blender/blenkernel/intern/gpencil.c

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



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

diff --cc source/blender/blenkernel/intern/gpencil.c
index 0c867cbba02,6a9511d8275..40f5238d2b3
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@@ -1194,32 -1338,11 +1338,37 @@@ bGPDlayer *BKE_gpencil_layer_active_get
    return NULL;
  }
  
 +bGPDlayer *BKE_gpencil_layer_get_by_name(bGPdata *gpd, char *name, int first_if_not_found)
 +{
 +  bGPDlayer *gpl;
 +  int i = 0;
 +
 +  /* error checking */
 +  if (ELEM(NULL, gpd, gpd->layers.first)) {
 +    return NULL;
 +  }
 +
 +  /* loop over layers until found (assume only one active) */
 +  for (gpl = gpd->layers.first; gpl; gpl = gpl->next) {
 +    if (STREQ(name, gpl->info)) {
 +      return gpl;
 +    }
 +    i++;
 +  }
 +
 +  /* no such layer */
 +  if (first_if_not_found) {
 +    return gpd->layers.first;
 +  }
 +  return NULL;
 +}
 +
 +/* set the active gp-layer */
+ /**
+  * Set active grease pencil layer.
+  * \param gpd: Grease pencil data-block
+  * \param active: Grease pencil layer to set as active
+  */
  void BKE_gpencil_layer_active_set(bGPdata *gpd, bGPDlayer *active)
  {
    /* error checking */
@@@ -1780,22 -2009,11 +2035,27 @@@ int BKE_gpencil_object_material_index_g
    return -1;
  }
  
 +int BKE_gpencil_object_material_get_index_name(Object *ob, char *name)
 +{
 +  short *totcol = BKE_object_material_len_p(ob);
 +  Material *read_ma = NULL;
 +  for (short i = 0; i < *totcol; i++) {
 +    read_ma = BKE_object_material_get(ob, i + 1);
 +    /* Material names are like "MAMaterial.001" */
 +    if (STREQ(name, &read_ma->id.name[2])) {
 +      return i;
 +    }
 +  }
 +
 +  return -1;
 +}
 +
 +/* Create a default palette */
+ /**
+  * Create a default palette.
+  * \param bmain: Main pointer
+  * \param scene: Scene
+  */
  void BKE_gpencil_palette_ensure(Main *bmain, Scene *scene)
  {
    const int totcol = 120;