diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-10-17 06:06:49 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-17 06:06:49 +0300 |
commit | 0ffa64a45f7d961cb079a56629bcff105c81eb56 (patch) | |
tree | 238bdd23687e6b54c1f75a35e5497837e8662bea /source/blender/editors/sculpt_paint/paint_intern.h | |
parent | dd91d7d09d9994bc20bdbfb501d5101044ac99c8 (diff) | |
parent | 99520e3f92e14eb3b7fab3f7decd0914a3da1360 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/sculpt_paint/paint_intern.h')
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_intern.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_intern.h b/source/blender/editors/sculpt_paint/paint_intern.h index b3b7d40391a..28d9dfe13b0 100644 --- a/source/blender/editors/sculpt_paint/paint_intern.h +++ b/source/blender/editors/sculpt_paint/paint_intern.h @@ -54,7 +54,7 @@ struct wmOperator; struct wmOperatorType; struct wmWindowManager; struct DMCoNo; -enum PaintMode; +enum ePaintMode; /* paint_stroke.c */ typedef bool (*StrokeGetLocation)(struct bContext *C, float location[3], const float mouse[2]); @@ -69,12 +69,12 @@ struct PaintStroke *paint_stroke_new(struct bContext *C, struct wmOperator *op, StrokeDone done, int event_type); void paint_stroke_data_free(struct wmOperator *op); -bool paint_space_stroke_enabled(struct Brush *br, enum PaintMode mode); -bool paint_supports_dynamic_size(struct Brush *br, enum PaintMode mode); -bool paint_supports_dynamic_tex_coords(struct Brush *br, enum PaintMode mode); -bool paint_supports_smooth_stroke(struct Brush *br, enum PaintMode mode); -bool paint_supports_texture(enum PaintMode mode); -bool paint_supports_jitter(enum PaintMode mode); +bool paint_space_stroke_enabled(struct Brush *br, enum ePaintMode mode); +bool paint_supports_dynamic_size(struct Brush *br, enum ePaintMode mode); +bool paint_supports_dynamic_tex_coords(struct Brush *br, enum ePaintMode mode); +bool paint_supports_smooth_stroke(struct Brush *br, enum ePaintMode mode); +bool paint_supports_texture(enum ePaintMode mode); +bool paint_supports_jitter(enum ePaintMode mode); struct wmKeyMap *paint_stroke_modal_keymap(struct wmKeyConfig *keyconf); int paint_stroke_modal(struct bContext *C, struct wmOperator *op, const struct wmEvent *event); @@ -335,7 +335,7 @@ typedef struct { int pixel_len; /* pixels around center that kernel is wide */ } BlurKernel; -enum BlurKernelType; +enum eBlurKernelType; /* can be extended to other blur kernels later */ BlurKernel *paint_new_blur_kernel(struct Brush *br, bool proj); void paint_delete_blur_kernel(BlurKernel *); |