From f2ed2b82ce954771d93543050cee7334f2e773af Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Fri, 1 Dec 2023 12:36:38 -0500 Subject: [PATCH] Cleanup: Use const arguments for some paint functions --- source/blender/blenkernel/BKE_paint.hh | 14 ++++++------ source/blender/blenkernel/intern/paint.cc | 26 +++++++++++------------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/source/blender/blenkernel/BKE_paint.hh b/source/blender/blenkernel/BKE_paint.hh index 93cf9c39fb5..22cdcdab169 100644 --- a/source/blender/blenkernel/BKE_paint.hh +++ b/source/blender/blenkernel/BKE_paint.hh @@ -174,7 +174,7 @@ void BKE_paint_free(Paint *p); * #id_us_plus(), rather than if we were copying between 2 existing scenes where a matching * value should decrease the existing user count as with #paint_brush_set() */ -void BKE_paint_copy(Paint *src, Paint *tar, int flag); +void BKE_paint_copy(const Paint *src, Paint *tar, int flag); void BKE_paint_runtime_init(const ToolSettings *ts, Paint *paint); @@ -202,21 +202,21 @@ void BKE_paint_curve_clamp_endpoint_add_index(PaintCurve *pc, int add_index); /** * Return true when in vertex/weight/texture paint + face-select mode? */ -bool BKE_paint_select_face_test(Object *ob); +bool BKE_paint_select_face_test(const Object *ob); /** * Return true when in vertex/weight paint + vertex-select mode? */ -bool BKE_paint_select_vert_test(Object *ob); +bool BKE_paint_select_vert_test(const Object *ob); /** * used to check if selection is possible * (when we don't care if its face or vert) */ -bool BKE_paint_select_elem_test(Object *ob); +bool BKE_paint_select_elem_test(const Object *ob); /** * Checks if face/vertex hiding is always applied in the current mode. * Returns true in vertex/weight paint. */ -bool BKE_paint_always_hide_test(Object *ob); +bool BKE_paint_always_hide_test(const Object *ob); /* Partial visibility. */ @@ -228,7 +228,7 @@ bool paint_is_grid_face_hidden(const unsigned int *grid_hidden, int gridsize, in /** * Return true if all vertices in the face are visible, false otherwise. */ -bool paint_is_bmesh_face_hidden(BMFace *f); +bool paint_is_bmesh_face_hidden(const BMFace *f); /* Paint masks. */ @@ -245,7 +245,7 @@ bool paint_calculate_rake_rotation(UnifiedPaintSettings *ups, bool stroke_has_started); void paint_update_brush_rake_rotation(UnifiedPaintSettings *ups, Brush *brush, float rotation); -void BKE_paint_stroke_get_average(Scene *scene, Object *ob, float stroke[3]); +void BKE_paint_stroke_get_average(const Scene *scene, const Object *ob, float stroke[3]); /* Tool slot API. */ diff --git a/source/blender/blenkernel/intern/paint.cc b/source/blender/blenkernel/intern/paint.cc index 679ef00f3b0..631f7589c27 100644 --- a/source/blender/blenkernel/intern/paint.cc +++ b/source/blender/blenkernel/intern/paint.cc @@ -400,7 +400,7 @@ Paint *BKE_paint_get_active_from_paintmode(Scene *sce, ePaintMode mode) return nullptr; } -const EnumPropertyItem *BKE_paint_get_tool_enum_from_paintmode(ePaintMode mode) +const EnumPropertyItem *BKE_paint_get_tool_enum_from_paintmode(const ePaintMode mode) { switch (mode) { case PAINT_MODE_SCULPT: @@ -430,7 +430,7 @@ const EnumPropertyItem *BKE_paint_get_tool_enum_from_paintmode(ePaintMode mode) return nullptr; } -const char *BKE_paint_get_tool_prop_id_from_paintmode(ePaintMode mode) +const char *BKE_paint_get_tool_prop_id_from_paintmode(const ePaintMode mode) { switch (mode) { case PAINT_MODE_SCULPT: @@ -462,7 +462,7 @@ const char *BKE_paint_get_tool_prop_id_from_paintmode(ePaintMode mode) return nullptr; } -const char *BKE_paint_get_tool_enum_translation_context_from_paintmode(ePaintMode mode) +const char *BKE_paint_get_tool_enum_translation_context_from_paintmode(const ePaintMode mode) { switch (mode) { case PAINT_MODE_SCULPT: @@ -1030,26 +1030,26 @@ bool BKE_palette_from_hash(Main *bmain, GHash *color_table, const char *name, co return done; } -bool BKE_paint_select_face_test(Object *ob) +bool BKE_paint_select_face_test(const Object *ob) { return ((ob != nullptr) && (ob->type == OB_MESH) && (ob->data != nullptr) && (((Mesh *)ob->data)->editflag & ME_EDIT_PAINT_FACE_SEL) && (ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT | OB_MODE_TEXTURE_PAINT))); } -bool BKE_paint_select_vert_test(Object *ob) +bool BKE_paint_select_vert_test(const Object *ob) { return ((ob != nullptr) && (ob->type == OB_MESH) && (ob->data != nullptr) && (((Mesh *)ob->data)->editflag & ME_EDIT_PAINT_VERT_SEL) && (ob->mode & OB_MODE_WEIGHT_PAINT || ob->mode & OB_MODE_VERTEX_PAINT)); } -bool BKE_paint_select_elem_test(Object *ob) +bool BKE_paint_select_elem_test(const Object *ob) { return (BKE_paint_select_vert_test(ob) || BKE_paint_select_face_test(ob)); } -bool BKE_paint_always_hide_test(Object *ob) +bool BKE_paint_always_hide_test(const Object *ob) { return ((ob != nullptr) && (ob->type == OB_MESH) && (ob->data != nullptr) && (ob->mode & OB_MODE_WEIGHT_PAINT || ob->mode & OB_MODE_VERTEX_PAINT)); @@ -1072,7 +1072,7 @@ void BKE_paint_cavity_curve_preset(Paint *p, int preset) BKE_curvemapping_changed(cumap, false); } -eObjectMode BKE_paint_object_mode_from_paintmode(ePaintMode mode) +eObjectMode BKE_paint_object_mode_from_paintmode(const ePaintMode mode) { switch (mode) { case PAINT_MODE_SCULPT: @@ -1218,7 +1218,7 @@ void BKE_paint_free(Paint *paint) MEM_SAFE_FREE(paint->tool_slots); } -void BKE_paint_copy(Paint *src, Paint *tar, const int flag) +void BKE_paint_copy(const Paint *src, Paint *tar, const int flag) { tar->brush = src->brush; tar->cavity_curve = BKE_curvemapping_copy(src->cavity_curve); @@ -1235,9 +1235,9 @@ void BKE_paint_copy(Paint *src, Paint *tar, const int flag) } } -void BKE_paint_stroke_get_average(Scene *scene, Object *ob, float stroke[3]) +void BKE_paint_stroke_get_average(const Scene *scene, const Object *ob, float stroke[3]) { - UnifiedPaintSettings *ups = &scene->toolsettings->unified_paint_settings; + const UnifiedPaintSettings *ups = &scene->toolsettings->unified_paint_settings; if (ups->last_stroke_valid && ups->average_stroke_counter > 0) { float fac = 1.0f / ups->average_stroke_counter; mul_v3_v3fl(stroke, ups->average_stroke_accum, fac); @@ -1291,7 +1291,7 @@ bool paint_is_grid_face_hidden(const uint *grid_hidden, int gridsize, int x, int BLI_BITMAP_TEST(grid_hidden, (y + 1) * gridsize + x)); } -bool paint_is_bmesh_face_hidden(BMFace *f) +bool paint_is_bmesh_face_hidden(const BMFace *f) { BMLoop *l_iter; BMLoop *l_first; @@ -1315,7 +1315,7 @@ float paint_grid_paint_mask(const GridPaintMask *gpm, uint level, uint x, uint y } /* Threshold to move before updating the brush rotation, reduces jitter. */ -static float paint_rake_rotation_spacing(UnifiedPaintSettings * /*ups*/, Brush *brush) +static float paint_rake_rotation_spacing(const UnifiedPaintSettings * /*ups*/, const Brush *brush) { return brush->sculpt_tool == SCULPT_TOOL_CLAY_STRIPS ? 1.0f : 20.0f; }