Grease Pencil v2 Branch

Improve current Grease Pencil in order to get a better 2D animation tool.

More info in WIKI pages: https://wiki.blender.org/index.php/User:Antoniov

Reviewed By: Severin, aligorith, campbellbarton

Patch by @antoniov, with edits by @Severin.

Differential Revision: https://developer.blender.org/D2115

1 files changed, 34 insertions, 3 deletions

diff --git a/source/blender/blenkernel/BKE_gpencil.h b/source/blender/blenkernel/BKE_gpencil.h
index e9e3cd3b16e..cbf167de25c 100644
--- a/source/blender/blenkernel/BKE_gpencil.h
+++ b/source/blender/blenkernel/BKE_gpencil.h
@@ -31,19 +31,25 @@
  *  \author Joshua Leung
  */
 
+struct ToolSettings;
 struct ListBase;
 struct bGPdata;
 struct bGPDlayer;
 struct bGPDframe;
 struct bGPDstroke;
+struct bGPDpalette;
+struct bGPDpalettecolor;
 struct Main;
 
 /* ------------ Grease-Pencil API ------------------ */
 
+void free_gpencil_stroke(struct bGPDstroke *gps);
 bool free_gpencil_strokes(struct bGPDframe *gpf);
 void free_gpencil_frames(struct bGPDlayer *gpl);
 void free_gpencil_layers(struct ListBase *list);
-void BKE_gpencil_free(struct bGPdata *gpd);
+void free_gpencil_brushes(struct ListBase *list);
+void free_gpencil_palettes(struct ListBase *list);
+void BKE_gpencil_free(struct bGPdata *gpd, bool free_palettes);
 
 void gpencil_stroke_sync_selection(struct bGPDstroke *gps);
 
@@ -52,17 +58,26 @@ struct bGPDframe *gpencil_frame_addcopy(struct bGPDlayer *gpl, int cframe);
 struct bGPDlayer *gpencil_layer_addnew(struct bGPdata *gpd, const char *name, bool setactive);
 struct bGPdata *gpencil_data_addnew(const char name[]);
 
-struct bGPDframe *gpencil_frame_duplicate(struct bGPDframe *src);
-struct bGPDlayer *gpencil_layer_duplicate(struct bGPDlayer *src);
+struct bGPDframe *gpencil_frame_duplicate(const struct bGPDframe *gpf_src);
+struct bGPDlayer *gpencil_layer_duplicate(const struct bGPDlayer *gpl_src);
 struct bGPdata *gpencil_data_duplicate(struct Main *bmain, struct bGPdata *gpd, bool internal_copy);
 
 void BKE_gpencil_make_local(struct Main *bmain, struct bGPdata *gpd, const bool lib_local);
 
 void gpencil_frame_delete_laststroke(struct bGPDlayer *gpl, struct bGPDframe *gpf);
 
+struct bGPDpalette *gpencil_palette_addnew(struct bGPdata *gpd, const char *name, bool setactive);
+struct bGPDpalette *gpencil_palette_duplicate(const struct bGPDpalette *palette_src);
+struct bGPDpalettecolor *gpencil_palettecolor_addnew(struct bGPDpalette *palette, const char *name, bool setactive);
+
+struct bGPDbrush *gpencil_brush_addnew(struct ToolSettings *ts, const char *name, bool setactive);
+struct bGPDbrush *gpencil_brush_duplicate(const struct bGPDbrush *brush_src);
+void gpencil_brush_init_presets(struct ToolSettings *ts);
+
 
 /* Stroke and Fill - Alpha Visibility Threshold */
 #define GPENCIL_ALPHA_OPACITY_THRESH 0.001f
+#define GPENCIL_STRENGTH_MIN 0.003f
 
 bool gpencil_layer_is_editable(const struct bGPDlayer *gpl);
 
@@ -87,4 +102,20 @@ struct bGPDlayer *gpencil_layer_getactive(struct bGPdata *gpd);
 void gpencil_layer_setactive(struct bGPdata *gpd, struct bGPDlayer *active);
 void gpencil_layer_delete(struct bGPdata *gpd, struct bGPDlayer *gpl);
 
+struct bGPDbrush *gpencil_brush_getactive(struct ToolSettings *ts);
+void gpencil_brush_setactive(struct ToolSettings *ts, struct bGPDbrush *active);
+void gpencil_brush_delete(struct ToolSettings *ts, struct bGPDbrush *palette);
+
+struct bGPDpalette *gpencil_palette_getactive(struct bGPdata *gpd);
+void gpencil_palette_setactive(struct bGPdata *gpd, struct bGPDpalette *active);
+void gpencil_palette_delete(struct bGPdata *gpd, struct bGPDpalette *palette);
+void gpencil_palette_change_strokes(struct bGPdata *gpd);
+
+struct bGPDpalettecolor *gpencil_palettecolor_getactive(struct bGPDpalette *palette);
+void gpencil_palettecolor_setactive(struct bGPDpalette *palette, struct bGPDpalettecolor *active);
+void gpencil_palettecolor_delete(struct bGPDpalette *palette, struct bGPDpalettecolor *palcolor);
+struct bGPDpalettecolor *gpencil_palettecolor_getbyname(struct bGPDpalette *palette, char *name);
+void gpencil_palettecolor_changename(struct bGPdata *gpd, char *oldname, const char *newname);
+void gpencil_palettecolor_delete_strokes(struct bGPdata *gpd, char *name);
+
 #endif /*  __BKE_GPENCIL_H__ */