diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-04-16 20:10:57 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-04-16 20:11:26 +0300 |
commit | afc2f415ab6997168b838102ab29ba15b306b80e (patch) | |
tree | 290ae6b3189c075fb1f95c7e409d019741f8905a /source/blender/blenkernel | |
parent | bbae0664a3df0ec3b3dcc199ab3a52a998bc5290 (diff) |
Cleanup: use const for sculpt code
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_brush.h | 32 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/brush.c | 25 |
2 files changed, 30 insertions, 27 deletions
diff --git a/source/blender/blenkernel/BKE_brush.h b/source/blender/blenkernel/BKE_brush.h index f8cd51b331d..023303fe602 100644 --- a/source/blender/blenkernel/BKE_brush.h +++ b/source/blender/blenkernel/BKE_brush.h @@ -79,34 +79,36 @@ struct ImBuf *BKE_brush_gen_radial_control_imbuf(struct Brush *br, bool secondar /* unified strength size and color */ -float *BKE_brush_color_get(const struct Scene *scene, struct Brush *brush); -float *BKE_brush_secondary_color_get(const struct Scene *scene, struct Brush *brush); +const float *BKE_brush_color_get(const struct Scene *scene, const struct Brush *brush); +const float *BKE_brush_secondary_color_get(const struct Scene *scene, const struct Brush *brush); void BKE_brush_color_set(struct Scene *scene, struct Brush *brush, const float color[3]); -int BKE_brush_size_get(const struct Scene *scene, struct Brush *brush); +int BKE_brush_size_get(const struct Scene *scene, const struct Brush *brush); void BKE_brush_size_set(struct Scene *scene, struct Brush *brush, int value); -float BKE_brush_unprojected_radius_get(const struct Scene *scene, struct Brush *brush); +float BKE_brush_unprojected_radius_get(const struct Scene *scene, const struct Brush *brush); void BKE_brush_unprojected_radius_set(struct Scene *scene, struct Brush *brush, float value); -float BKE_brush_alpha_get(const struct Scene *scene, struct Brush *brush); +float BKE_brush_alpha_get(const struct Scene *scene, const struct Brush *brush); void BKE_brush_alpha_set(Scene *scene, struct Brush *brush, float alpha); -float BKE_brush_weight_get(const Scene *scene, struct Brush *brush); +float BKE_brush_weight_get(const Scene *scene, const struct Brush *brush); void BKE_brush_weight_set(const Scene *scene, struct Brush *brush, float value); -int BKE_brush_use_locked_size(const struct Scene *scene, struct Brush *brush); -int BKE_brush_use_alpha_pressure(const struct Scene *scene, struct Brush *brush); -int BKE_brush_use_size_pressure(const struct Scene *scene, struct Brush *brush); +int BKE_brush_use_locked_size(const struct Scene *scene, const struct Brush *brush); +int BKE_brush_use_alpha_pressure(const struct Scene *scene, const struct Brush *brush); +int BKE_brush_use_size_pressure(const struct Scene *scene, const struct Brush *brush); /* scale unprojected radius to reflect a change in the brush's 2D size */ -void BKE_brush_scale_unprojected_radius(float *unprojected_radius, - int new_brush_size, - int old_brush_size); +void BKE_brush_scale_unprojected_radius( + float *unprojected_radius, + int new_brush_size, + int old_brush_size); /* scale brush size to reflect a change in the brush's unprojected radius */ -void BKE_brush_scale_size(int *BKE_brush_size_get, - float new_unprojected_radius, - float old_unprojected_radius); +void BKE_brush_scale_size( + int *r_brush_size, + float new_unprojected_radius, + float old_unprojected_radius); /* debugging only */ void BKE_brush_debug_print_state(struct Brush *br); diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c index 661bf6e7d76..307f97f1344 100644 --- a/source/blender/blenkernel/intern/brush.c +++ b/source/blender/blenkernel/intern/brush.c @@ -782,13 +782,13 @@ float BKE_brush_sample_masktex(const Scene *scene, Brush *br, * inconsistency. */ -float *BKE_brush_color_get(const struct Scene *scene, struct Brush *brush) +const float *BKE_brush_color_get(const struct Scene *scene, const struct Brush *brush) { UnifiedPaintSettings *ups = &scene->toolsettings->unified_paint_settings; return (ups->flag & UNIFIED_PAINT_COLOR) ? ups->rgb : brush->rgb; } -float *BKE_brush_secondary_color_get(const struct Scene *scene, struct Brush *brush) +const float *BKE_brush_secondary_color_get(const struct Scene *scene, const struct Brush *brush) { UnifiedPaintSettings *ups = &scene->toolsettings->unified_paint_settings; return (ups->flag & UNIFIED_PAINT_COLOR) ? ups->secondary_rgb : brush->secondary_rgb; @@ -819,7 +819,7 @@ void BKE_brush_size_set(Scene *scene, Brush *brush, int size) brush->size = size; } -int BKE_brush_size_get(const Scene *scene, Brush *brush) +int BKE_brush_size_get(const Scene *scene, const Brush *brush) { UnifiedPaintSettings *ups = &scene->toolsettings->unified_paint_settings; int size = (ups->flag & UNIFIED_PAINT_SIZE) ? ups->size : brush->size; @@ -827,7 +827,7 @@ int BKE_brush_size_get(const Scene *scene, Brush *brush) return (int)((float)size * U.pixelsize); } -int BKE_brush_use_locked_size(const Scene *scene, Brush *brush) +int BKE_brush_use_locked_size(const Scene *scene, const Brush *brush) { const short us_flag = scene->toolsettings->unified_paint_settings.flag; @@ -836,7 +836,7 @@ int BKE_brush_use_locked_size(const Scene *scene, Brush *brush) (brush->flag & BRUSH_LOCK_SIZE); } -int BKE_brush_use_size_pressure(const Scene *scene, Brush *brush) +int BKE_brush_use_size_pressure(const Scene *scene, const Brush *brush) { const short us_flag = scene->toolsettings->unified_paint_settings.flag; @@ -845,7 +845,7 @@ int BKE_brush_use_size_pressure(const Scene *scene, Brush *brush) (brush->flag & BRUSH_SIZE_PRESSURE); } -int BKE_brush_use_alpha_pressure(const Scene *scene, Brush *brush) +int BKE_brush_use_alpha_pressure(const Scene *scene, const Brush *brush) { const short us_flag = scene->toolsettings->unified_paint_settings.flag; @@ -864,7 +864,7 @@ void BKE_brush_unprojected_radius_set(Scene *scene, Brush *brush, float unprojec brush->unprojected_radius = unprojected_radius; } -float BKE_brush_unprojected_radius_get(const Scene *scene, Brush *brush) +float BKE_brush_unprojected_radius_get(const Scene *scene, const Brush *brush) { UnifiedPaintSettings *ups = &scene->toolsettings->unified_paint_settings; @@ -883,14 +883,14 @@ void BKE_brush_alpha_set(Scene *scene, Brush *brush, float alpha) brush->alpha = alpha; } -float BKE_brush_alpha_get(const Scene *scene, Brush *brush) +float BKE_brush_alpha_get(const Scene *scene, const Brush *brush) { UnifiedPaintSettings *ups = &scene->toolsettings->unified_paint_settings; return (ups->flag & UNIFIED_PAINT_ALPHA) ? ups->alpha : brush->alpha; } -float BKE_brush_weight_get(const Scene *scene, Brush *brush) +float BKE_brush_weight_get(const Scene *scene, const Brush *brush) { UnifiedPaintSettings *ups = &scene->toolsettings->unified_paint_settings; @@ -920,9 +920,10 @@ void BKE_brush_scale_unprojected_radius(float *unprojected_radius, } /* scale brush size to reflect a change in the brush's unprojected radius */ -void BKE_brush_scale_size(int *r_brush_size, - float new_unprojected_radius, - float old_unprojected_radius) +void BKE_brush_scale_size( + int *r_brush_size, + float new_unprojected_radius, + float old_unprojected_radius) { float scale = new_unprojected_radius; /* avoid division by zero */ |