[Bf-blender-cvs] [1623bdd948f] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

[Antonio Vazquez]

Commit: 1623bdd948f5f66aff7619cb92538fc55c356e20
Author: Antonio Vazquez
Date:   Fri Jun 16 09:50:03 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB1623bdd948f5f66aff7619cb92538fc55c356e20

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/blenkernel/BKE_paint.h
index d31392936d2,787a67170c2..195720d4389
--- a/source/blender/blenkernel/BKE_paint.h
+++ b/source/blender/blenkernel/BKE_paint.h
@@@ -100,21 -100,12 +100,21 @@@ void BKE_paint_set_overlay_override(enu
  /* palettes */
  void                 BKE_palette_free(struct Palette *palette);
  struct Palette      *BKE_palette_add(struct Main *bmain, const char *name);
 +struct Palette      *BKE_palette_add_gpencil(const struct bContext *C);
- struct Palette      *BKE_palette_copy(struct Main *bmain, struct Palette *palette);
+ struct Palette      *BKE_palette_copy(struct Main *bmain, const struct Palette *palette);
  void                 BKE_palette_make_local(struct Main *bmain, struct Palette *palette, const bool lib_local);
 -struct PaletteColor *BKE_palette_color_add(struct Palette *palette);
  bool                 BKE_palette_is_empty(const struct Palette *palette);
 -void                 BKE_palette_color_remove(struct Palette *palette, struct PaletteColor *color);
  void                 BKE_palette_clear(struct Palette *palette);
 +struct Palette      *BKE_palette_get_active_from_context(const struct bContext *C);
 +
 +struct PaletteColor *BKE_palette_color_add(struct Palette *palette);
 +struct PaletteColor *BKE_palette_color_add_name(struct Palette *palette, const char *name);
 +struct PaletteColor *BKE_palette_color_getbyname(struct Palette *palette, char *name);
 +struct PaletteColor *BKE_gpencil_palettecolor_getbyrgb(struct Palette *palette, float rgb[3]);
 +struct PaletteColor *BKE_gpencil_palettecolor_getbyrgba(struct Palette *palette, float rgba[4]);
 +void                 BKE_palette_color_remove(struct Palette *palette, struct PaletteColor *color);
 +struct PaletteColor *BKE_palette_color_get_active(struct Palette *palette);
 +struct PaletteColor *BKE_palette_color_get_active_from_context(const struct bContext *C);
  
  /* paint curves */
  struct PaintCurve *BKE_paint_curve_add(struct Main *bmain, const char *name);
diff --cc source/blenderplayer/bad_level_call_stubs/stubs.c
index e914c747e18,255ac28b64e..56613b14ba5
--- a/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@@ -114,8 -114,8 +114,9 @@@ struct bConstraint
  struct bConstraintOb;
  struct bConstraintTarget;
  struct bContextDataResult;
 +struct bGPdata;
  struct bGPDlayer;
+ struct bFaceMap;
  struct bNode;
  struct bNodeType;
  struct bNodeSocket;