diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-10-17 05:43:10 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-17 05:49:20 +0300 |
| commit | 99520e3f92e14eb3b7fab3f7decd0914a3da1360 (patch) | |
| tree | 79947d6dbf20e773b107359e9faddc5a17c0271b /source/blender/editors/sculpt_paint/paint_image.c | |
| parent | 57ec19e0e5cbb96392eccf12d4ccc17c4cf9b65b (diff) | |
Cleanup: use 'e' prefix for enum typedefs
Convention was only followed loosely,
apply to DNA where changes aren't likely to conflict.
(Skipped ModifierType for eg).
Diffstat (limited to 'source/blender/editors/sculpt_paint/paint_image.c')
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_image.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index 79ce440251d..5343aa72b01 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -510,7 +510,7 @@ BlurKernel *paint_new_blur_kernel(Brush *br, bool proj) BlurKernel *kernel = MEM_mallocN(sizeof(BlurKernel), "blur kernel"); float radius; int side; - BlurKernelType type = br->blur_mode; + eBlurKernelType type = br->blur_mode; if (proj) { radius = 0.5f; @@ -624,13 +624,13 @@ static int image_paint_2d_clone_poll(bContext *C) } /************************ paint operator ************************/ -typedef enum TexPaintMode { +typedef enum eTexPaintMode { PAINT_MODE_2D, PAINT_MODE_3D_PROJECT -} TexPaintMode; +} eTexPaintMode; typedef struct PaintOperation { - TexPaintMode mode; + eTexPaintMode mode; void *custom_paint; @@ -1186,7 +1186,7 @@ static int sample_color_exec(bContext *C, wmOperator *op) { Paint *paint = BKE_paint_get_active_from_context(C); Brush *brush = BKE_paint_brush(paint); - PaintMode mode = BKE_paintmode_get_active_from_context(C); + ePaintMode mode = BKE_paintmode_get_active_from_context(C); ARegion *ar = CTX_wm_region(C); wmWindow *win = CTX_wm_window(C); const bool show_cursor = ((paint->flags & PAINT_SHOW_BRUSH) != 0); @@ -1238,7 +1238,7 @@ static int sample_color_invoke(bContext *C, wmOperator *op, const wmEvent *event RNA_int_set_array(op->ptr, "location", event->mval); - PaintMode mode = BKE_paintmode_get_active_from_context(C); + ePaintMode mode = BKE_paintmode_get_active_from_context(C); const bool use_sample_texture = (mode == ePaintTextureProjective) && !RNA_boolean_get(op->ptr, "merged"); paint_sample_color(C, ar, event->mval[0], event->mval[1], use_sample_texture, false); @@ -1274,7 +1274,7 @@ static int sample_color_modal(bContext *C, wmOperator *op, const wmEvent *event) return OPERATOR_FINISHED; } - PaintMode mode = BKE_paintmode_get_active_from_context(C); + ePaintMode mode = BKE_paintmode_get_active_from_context(C); const bool use_sample_texture = (mode == ePaintTextureProjective) && !RNA_boolean_get(op->ptr, "merged"); switch (event->type) { |