From afc2f415ab6997168b838102ab29ba15b306b80e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 17 Apr 2015 03:10:57 +1000 Subject: Cleanup: use const for sculpt code --- source/blender/blenkernel/BKE_brush.h | 32 +++++++++++++++------------- source/blender/blenkernel/intern/brush.c | 25 +++++++++++----------- source/blender/editors/sculpt_paint/sculpt.c | 20 ++++++++++------- 3 files changed, 42 insertions(+), 35 deletions(-) (limited to 'source/blender') 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 */ diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index b14fbc40049..165de4ca791 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -705,10 +705,10 @@ static float calc_symmetry_feather(Sculpt *sd, StrokeCache *cache) /* Return modified brush strength. Includes the direction of the brush, positive * values pull vertices, negative values push. Uses tablet pressure and a * special multiplier found experimentally to scale the strength factor. */ -static float brush_strength(Sculpt *sd, StrokeCache *cache, float feather, UnifiedPaintSettings *ups) +static float brush_strength(const Sculpt *sd, const StrokeCache *cache, const float feather, const UnifiedPaintSettings *ups) { const Scene *scene = cache->vc->scene; - Brush *brush = BKE_paint_brush(&sd->paint); + const Brush *brush = BKE_paint_brush((Paint *)&sd->paint); /* Primary strength input; square it to make lower values more sensitive */ const float root_alpha = BKE_brush_alpha_get(scene, brush); @@ -2450,20 +2450,24 @@ static void calc_sculpt_plane(Sculpt *sd, Object *ob, PBVHNode **nodes, int totn } /* Projects a point onto a plane along the plane's normal */ -static void point_plane_project(float intr[3], float co[3], float plane_normal[3], float plane_center[3]) +static void point_plane_project( + float intr[3], + const float co[3], const float plane_normal[3], const float plane_center[3]) { sub_v3_v3v3(intr, co, plane_center); mul_v3_v3fl(intr, plane_normal, dot_v3v3(plane_normal, intr)); sub_v3_v3v3(intr, co, intr); } -static int plane_trim(StrokeCache *cache, Brush *brush, float val[3]) +static int plane_trim(const StrokeCache *cache, const Brush *brush, const float val[3]) { return (!(brush->flag & BRUSH_PLANE_TRIM) || ((dot_v3v3(val, val) <= cache->radius_squared * cache->plane_trim_squared))); } -static int plane_point_side_flip(float co[3], float plane_normal[3], float plane_center[3], int flip) +static bool plane_point_side_flip( + const float co[3], const float plane_normal[3], const float plane_center[3], + const bool flip) { float delta[3]; float d; @@ -2476,7 +2480,7 @@ static int plane_point_side_flip(float co[3], float plane_normal[3], float plane return d <= 0.0f; } -static int plane_point_side(float co[3], float plane_normal[3], float plane_center[3]) +static int plane_point_side(const float co[3], const float plane_normal[3], const float plane_center[3]) { float delta[3]; @@ -2577,7 +2581,7 @@ static void do_clay_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int totnode) float temp[3]; - int flip; + bool flip; calc_sculpt_plane(sd, ob, nodes, totnode, an, fc); @@ -2655,7 +2659,7 @@ static void do_clay_strips_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int t float scale[4][4]; float tmat[4][4]; - int flip; + bool flip; calc_sculpt_plane(sd, ob, nodes, totnode, sn, fc); -- cgit v1.2.3