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

Antonio Vazquez noreply at git.blender.org
Mon Mar 9 16:11:03 CET 2020


Commit: e1f84c329aeadfd96d128f1f09e0691502630769
Author: Antonio Vazquez
Date:   Mon Mar 9 16:10:43 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rBe1f84c329aeadfd96d128f1f09e0691502630769

Merge branch 'master' into greasepencil-object

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



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

diff --cc source/blender/blenkernel/BKE_paint.h
index 1ca0eee9068,5283672bdde..46fb254a387
--- a/source/blender/blenkernel/BKE_paint.h
+++ b/source/blender/blenkernel/BKE_paint.h
@@@ -149,24 -143,9 +149,18 @@@ bool BKE_palette_is_empty(const struct 
  void BKE_palette_color_remove(struct Palette *palette, struct PaletteColor *color);
  void BKE_palette_clear(struct Palette *palette);
  
 +void BKE_palette_sort_hsv(struct tPaletteColorHSV *color_array, const int totcol);
 +void BKE_palette_sort_svh(struct tPaletteColorHSV *color_array, const int totcol);
 +void BKE_palette_sort_vhs(struct tPaletteColorHSV *color_array, const int totcol);
 +void BKE_palette_sort_luminance(struct tPaletteColorHSV *color_array, const int totcol);
 +bool BKE_palette_from_hash(struct Main *bmain,
 +                           struct GHash *color_table,
 +                           const char *name,
 +                           const bool linear);
 +
  /* paint curves */
  struct PaintCurve *BKE_paint_curve_add(struct Main *bmain, const char *name);
- void BKE_paint_curve_free(struct PaintCurve *pc);
- void BKE_paint_curve_copy_data(struct Main *bmain,
-                                struct PaintCurve *pc_dst,
-                                const struct PaintCurve *pc_src,
-                                const int flag);
  struct PaintCurve *BKE_paint_curve_copy(struct Main *bmain, const struct PaintCurve *pc);
- void BKE_paint_curve_make_local(struct Main *bmain, struct PaintCurve *pc, const int flags);
  
  bool BKE_paint_ensure(struct ToolSettings *ts, struct Paint **r_paint);
  void BKE_paint_init(struct Main *bmain, struct Scene *sce, ePaintMode mode, const char col[3]);



More information about the Bf-blender-cvs mailing list