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/blenkernel/intern | |
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/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/brush.c | 3 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/paint.c | 16 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/writeffmpeg.c | 2 |
3 files changed, 10 insertions, 11 deletions
diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c index aeaead578a1..c36c6c56d5e 100644 --- a/source/blender/blenkernel/intern/brush.c +++ b/source/blender/blenkernel/intern/brush.c @@ -438,9 +438,8 @@ void BKE_brush_sculpt_reset(Brush *br) /** * Library Operations - * \param preset CurveMappingPreset */ -void BKE_brush_curve_preset(Brush *b, int preset) +void BKE_brush_curve_preset(Brush *b, eCurveMappingPreset preset) { CurveMap *cm = NULL; diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index 62af61585c1..c1ad31a1cab 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -72,7 +72,7 @@ const char PAINT_CURSOR_VERTEX_PAINT[3] = {255, 255, 255}; const char PAINT_CURSOR_WEIGHT_PAINT[3] = {200, 200, 255}; const char PAINT_CURSOR_TEXTURE_PAINT[3] = {255, 255, 255}; -static OverlayControlFlags overlay_flags = 0; +static eOverlayControlFlags overlay_flags = 0; void BKE_paint_invalidate_overlay_tex(Scene *scene, const Tex *tex) { @@ -104,12 +104,12 @@ void BKE_paint_invalidate_overlay_all(void) PAINT_INVALID_OVERLAY_CURVE); } -OverlayControlFlags BKE_paint_get_overlay_flags(void) +eOverlayControlFlags BKE_paint_get_overlay_flags(void) { return overlay_flags; } -void BKE_paint_set_overlay_override(OverlayFlags flags) +void BKE_paint_set_overlay_override(eOverlayFlags flags) { if (flags & BRUSH_OVERLAY_OVERRIDE_MASK) { if (flags & BRUSH_OVERLAY_CURSOR_OVERRIDE_ON_STROKE) @@ -124,12 +124,12 @@ void BKE_paint_set_overlay_override(OverlayFlags flags) } } -void BKE_paint_reset_overlay_invalid(OverlayControlFlags flag) +void BKE_paint_reset_overlay_invalid(eOverlayControlFlags flag) { overlay_flags &= ~(flag); } -Paint *BKE_paint_get_active_from_paintmode(Scene *sce, PaintMode mode) +Paint *BKE_paint_get_active_from_paintmode(Scene *sce, ePaintMode mode) { if (sce) { ToolSettings *ts = sce->toolsettings; @@ -235,7 +235,7 @@ Paint *BKE_paint_get_active_from_context(const bContext *C) return NULL; } -PaintMode BKE_paintmode_get_active_from_context(const bContext *C) +ePaintMode BKE_paintmode_get_active_from_context(const bContext *C) { Scene *sce = CTX_data_scene(C); SpaceImage *sima; @@ -496,7 +496,7 @@ void BKE_paint_cavity_curve_preset(Paint *p, int preset) curvemapping_changed(p->cavity_curve, false); } -short BKE_paint_object_mode_from_paint_mode(PaintMode mode) +short BKE_paint_object_mode_from_paint_mode(ePaintMode mode) { switch (mode) { case ePaintSculpt: @@ -517,7 +517,7 @@ short BKE_paint_object_mode_from_paint_mode(PaintMode mode) } } -void BKE_paint_init(Scene *sce, PaintMode mode, const char col[3]) +void BKE_paint_init(Scene *sce, ePaintMode mode, const char col[3]) { UnifiedPaintSettings *ups = &sce->toolsettings->unified_paint_settings; Brush *brush; diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c index a19e4142894..b5484291e37 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -75,7 +75,7 @@ typedef struct FFMpegContext { bool ffmpeg_preview; int ffmpeg_crf; /* set to 0 to not use CRF mode; we have another flag for lossless anyway. */ - int ffmpeg_preset; /* see FFMpegPreset */ + int ffmpeg_preset; /* see eFFMpegPreset */ AVFormatContext *outfile; AVStream *video_stream; |