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

[Antonio Vazquez]

Commit: 18ba1269a56f087fb24f5216f1ba21b0c9ce485e
Author: Antonio Vazquez
Date:   Mon Mar 2 16:23:15 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rB18ba1269a56f087fb24f5216f1ba21b0c9ce485e

Merge branch 'master' into greasepencil-object

 Conflicts:
	source/blender/blenkernel/BKE_gpencil.h
	source/blender/blenkernel/BKE_gpencil_modifier.h
	source/blender/editors/include/ED_gpencil.h

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



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

diff --cc source/blender/blenkernel/BKE_gpencil_modifier.h
index 10bc4aef40b,3a1e729e4de..b48a6284567
--- a/source/blender/blenkernel/BKE_gpencil_modifier.h
+++ b/source/blender/blenkernel/BKE_gpencil_modifier.h
@@@ -290,13 -322,8 +294,17 @@@ void BKE_gpencil_modifiers_calc(struct 
                                  struct Scene *scene,
                                  struct Object *ob);
  
 +void BKE_gpencil_prepare_eval_data(struct Depsgraph *depsgraph,
 +                                   struct Scene *scene,
 +                                   struct Object *ob);
 +
 +struct bGPDframe *BKE_gpencil_frame_retime_get(struct Depsgraph *depsgraph,
 +                                               struct Scene *scene,
 +                                               struct Object *ob,
 +                                               struct bGPDlayer *gpl);
 +
+ #ifdef __cplusplus
+ }
+ #endif
+ 
  #endif /* __BKE_GPENCIL_MODIFIER_H__ */
diff --cc source/blender/editors/include/ED_gpencil.h
index 08d5685c0bc,d8088dd8454..29455d6380f
--- a/source/blender/editors/include/ED_gpencil.h
+++ b/source/blender/editors/include/ED_gpencil.h
@@@ -283,23 -306,8 +287,27 @@@ void ED_gpencil_sbuffer_update_eval(str
  /* Tag all scene grease pencil object to update. */
  void ED_gpencil_tag_scene_gpencil(struct Scene *scene);
  
 +/* Vertex color set. */
 +void ED_gpencil_fill_vertex_color_set(struct ToolSettings *ts,
 +                                      struct Brush *brush,
 +                                      struct bGPDstroke *gps);
 +void ED_gpencil_point_vertex_color_set(struct ToolSettings *ts,
 +                                       struct Brush *brush,
 +                                       struct bGPDspoint *pt);
 +void ED_gpencil_sbuffer_vertex_color_set(struct Depsgraph *depsgraph,
 +                                         struct Object *ob,
 +                                         struct ToolSettings *ts,
 +                                         struct Brush *brush,
 +                                         struct Material *material);
 +
 +bool ED_gpencil_stroke_check_collision(struct GP_SpaceConversion *gsc,
 +                                       struct bGPDstroke *gps,
 +                                       float mouse[2],
 +                                       const int radius,
 +                                       const float diff_mat[4][4]);
 +
+ #ifdef __cplusplus
+ }
+ #endif
+ 
  #endif /*  __ED_GPENCIL_H__ */