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

[Antonio Vazquez]

Commit: 2c323dc875b712d1208d53112f62754c1d8ae7bd
Author: Antonio Vazquez
Date:   Sat Jan 16 17:01:03 2021 +0100
Branches: greasepencil-object
https://developer.blender.org/rB2c323dc875b712d1208d53112f62754c1d8ae7bd

Merge branch 'master' into greasepencil-object

 Conflicts:
	source/blender/editors/include/ED_gpencil.h

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



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

diff --cc source/blender/editors/include/ED_gpencil.h
index 7b324ae9554,acaa6495ba9..1e6cd18193e
--- a/source/blender/editors/include/ED_gpencil.h
+++ b/source/blender/editors/include/ED_gpencil.h
@@@ -147,12 -147,9 +147,12 @@@ bool ED_gpencil_has_keyframe_v3d(struc
  
  bool ED_gpencil_stroke_can_use_direct(const struct ScrArea *area, const struct bGPDstroke *gps);
  bool ED_gpencil_stroke_can_use(const struct bContext *C, const struct bGPDstroke *gps);
- bool ED_gpencil_stroke_color_use(struct Object *ob,
-                                  const struct bGPDlayer *gpl,
-                                  const struct bGPDstroke *gps);
+ bool ED_gpencil_stroke_material_editable(struct Object *ob,
+                                          const struct bGPDlayer *gpl,
+                                          const struct bGPDstroke *gps);
 +bool ED_gpencil_stroke_material_visible(struct Object *ob,
 +                                        const struct bGPDlayer *gpl,
 +                                        const struct bGPDstroke *gps);
  
  /* ----------- Grease Pencil Operators ----------------- */