diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-06 15:36:12 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-06 15:36:12 +0300 |
| commit | 0eb9d2adc6d70bd611803201881ef63e341c80f5 (patch) | |
| tree | 5e802e0e0d16d2670e80be04b491ed29b238ac68 | |
| parent | 885d78150d092756c44519dd9fd19a4d88f02354 (diff) | |
| parent | f9f64ca4a3170fda239ac27542046942cce23876 (diff) | |
Merge branch 'master' into blender2.8
| -rw-r--r-- | source/blender/blenkernel/BKE_brush.h | 5 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/brush.c | 4 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_brush_types.h | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/blenkernel/BKE_brush.h b/source/blender/blenkernel/BKE_brush.h index e7af7400850..f2601f2ca32 100644 --- a/source/blender/blenkernel/BKE_brush.h +++ b/source/blender/blenkernel/BKE_brush.h @@ -36,6 +36,7 @@ struct Scene; struct UnifiedPaintSettings; // enum eCurveMappingPreset; +#include "DNA_object_enums.h" /* globals for brush execution */ void BKE_brush_system_init(void); @@ -43,8 +44,8 @@ void BKE_brush_system_exit(void); /* datablock functions */ 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_add(struct Main *bmain, const char *name, const eObjectMode ob_mode); +struct Brush *BKE_brush_first_search(struct Main *bmain, const eObjectMode ob_mode); 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); diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c index 8d63c1cfb44..d82c1ca56fe 100644 --- a/source/blender/blenkernel/intern/brush.c +++ b/source/blender/blenkernel/intern/brush.c @@ -151,7 +151,7 @@ void BKE_brush_init(Brush *brush) /** * \note Resulting brush will have two users: one as a fake user, another is assumed to be used by the caller. */ -Brush *BKE_brush_add(Main *bmain, const char *name, short ob_mode) +Brush *BKE_brush_add(Main *bmain, const char *name, const eObjectMode ob_mode) { Brush *brush; @@ -164,7 +164,7 @@ Brush *BKE_brush_add(Main *bmain, const char *name, short ob_mode) return brush; } -struct Brush *BKE_brush_first_search(struct Main *bmain, short ob_mode) +struct Brush *BKE_brush_first_search(struct Main *bmain, const eObjectMode ob_mode) { Brush *brush; diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h index 407d59f09da..fc3b4afe18d 100644 --- a/source/blender/makesdna/DNA_brush_types.h +++ b/source/blender/makesdna/DNA_brush_types.h @@ -72,7 +72,7 @@ typedef struct Brush { float rake_factor; /* rake actual data (not texture), used for sculpt */ short blend; /* blend mode */ - short ob_mode; /* & with ob->mode to see if the brush is compatible, use for display only. */ + short ob_mode; /* eObjectMode: to see if the brush is compatible, use for display only. */ float weight; /* brush weight */ int size; /* brush diameter */ int flag; /* general purpose flag */ |