diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-06-14 23:39:33 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-06-14 23:39:33 +0300 |
| commit | 7439919ac0c4b0146cfed0ddbb8b945fe3675bcb (patch) | |
| tree | 39730e1c17f939bd12e465ce597e2f24bbd91d34 /source/blender/blenkernel/intern/paint.c | |
| parent | dbca1afefa700f25198761624cdb9f1fd21095d2 (diff) | |
| parent | eeb9e5316a615f0e5052b28eee4966c4e2ed1152 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/paint.c')
| -rw-r--r-- | source/blender/blenkernel/intern/paint.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index 5a85637755d..00efa4aa732 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -317,7 +317,7 @@ PaintCurve *BKE_paint_curve_add(Main *bmain, const char *name) return pc; } -PaintCurve *BKE_paint_curve_copy(Main *bmain, PaintCurve *pc) +PaintCurve *BKE_paint_curve_copy(Main *bmain, const PaintCurve *pc) { PaintCurve *pc_new; @@ -399,7 +399,7 @@ Palette *BKE_palette_add(Main *bmain, const char *name) return palette; } -Palette *BKE_palette_copy(Main *bmain, Palette *palette) +Palette *BKE_palette_copy(Main *bmain, const Palette *palette) { Palette *palette_new; |