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

[Antonio Vazquez]

Commit: 64c66e63cf6348e3a54b7a7a1cb7792e8af28315
Author: Antonio Vazquez
Date:   Fri Sep 11 15:42:14 2020 +0200
Branches: greasepencil-object
https://developer.blender.org/rB64c66e63cf6348e3a54b7a7a1cb7792e8af28315

Merge branch 'master' into greasepencil-object

 Conflicts:
	source/blender/blenkernel/BKE_gpencil.h

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



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

diff --cc source/blender/blenkernel/BKE_gpencil.h
index 5cde158340d,f1912b14e8c..c484f0753a3
--- a/source/blender/blenkernel/BKE_gpencil.h
+++ b/source/blender/blenkernel/BKE_gpencil.h
@@@ -281,8 -282,8 +282,10 @@@ void BKE_gpencil_parent_matrix_get(cons
  
  void BKE_gpencil_update_layer_parent(const struct Depsgraph *depsgraph, struct Object *ob);
  
 +int BKE_gpencil_material_find_index_by_name_prefix(struct Object *ob, const char *name_prefix);
 +
+ void BKE_gpencil_blend_read_data(struct BlendDataReader *reader, struct bGPdata *gpd);
+ 
  #ifdef __cplusplus
  }
  #endif