diff options
| author | Darshan Kadu <darsh7807@gmail.com> | 2017-09-10 15:41:40 +0300 |
|---|---|---|
| committer | Darshan Kadu <darsh7807@gmail.com> | 2017-09-10 15:41:40 +0300 |
| commit | 6594fa1ce02809a275c9cd488fa0223d03d73571 (patch) | |
| tree | 0bcd95846e1e3b09239126b40ef434ed3dc3a50d /source/blender/blenkernel/BKE_brush.h | |
| parent | f2017083a19e5c83aadc575625dce0642ffce6c5 (diff) | |
merged the master branchsoc-2017-vertex_paint
Diffstat (limited to 'source/blender/blenkernel/BKE_brush.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_brush.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_brush.h b/source/blender/blenkernel/BKE_brush.h index 8bd4bdf89e1..dedb75a080a 100644 --- a/source/blender/blenkernel/BKE_brush.h +++ b/source/blender/blenkernel/BKE_brush.h @@ -44,7 +44,8 @@ void BKE_brush_system_exit(void); void BKE_brush_init(struct Brush *brush); struct Brush *BKE_brush_add(struct Main *bmain, const char *name, short ob_mode); struct Brush *BKE_brush_first_search(struct Main *bmain, short ob_mode); -struct Brush *BKE_brush_copy(struct Main *bmain, struct Brush *brush); +void BKE_brush_copy_data(struct Main *bmain, struct Brush *brush_dst, const struct Brush *brush_src, const int flag); +struct Brush *BKE_brush_copy(struct Main *bmain, const struct Brush *brush); void BKE_brush_make_local(struct Main *bmain, struct Brush *brush, const bool lib_local); void BKE_brush_unlink(struct Main *bmain, struct Brush *brush); void BKE_brush_free(struct Brush *brush); |