Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <campbell@blender.org>2022-01-07 03:38:08 +0300
committerCampbell Barton <campbell@blender.org>2022-01-07 06:16:26 +0300
commit3d3bc748849834ef74563deb603ab43859cffeeb (patch)
treede74ce4722b2cb032c22dbc090a15dd2e172c29b /source/blender/bmesh/tools
parentbb69c19f08ac681d4386325e4318ebfbef2e9531 (diff)
Cleanup: remove redundant const qualifiers for POD types
MSVC used to warn about const mismatch for arguments passed by value. Remove these as newer versions of MSVC no longer show this warning.
Diffstat (limited to 'source/blender/bmesh/tools')
-rw-r--r--source/blender/bmesh/tools/bmesh_beautify.h14
-rw-r--r--source/blender/bmesh/tools/bmesh_bevel.h40
-rw-r--r--source/blender/bmesh/tools/bmesh_bisect_plane.h10
-rw-r--r--source/blender/bmesh/tools/bmesh_boolean.h24
-rw-r--r--source/blender/bmesh/tools/bmesh_decimate.h26
-rw-r--r--source/blender/bmesh/tools/bmesh_edgenet.h2
-rw-r--r--source/blender/bmesh/tools/bmesh_edgesplit.h5
-rw-r--r--source/blender/bmesh/tools/bmesh_intersect.h18
-rw-r--r--source/blender/bmesh/tools/bmesh_intersect_edges.h2
-rw-r--r--source/blender/bmesh/tools/bmesh_path_region_uv.h6
-rw-r--r--source/blender/bmesh/tools/bmesh_triangulate.h8
-rw-r--r--source/blender/bmesh/tools/bmesh_wireframe.h28
12 files changed, 90 insertions, 93 deletions
diff --git a/source/blender/bmesh/tools/bmesh_beautify.h b/source/blender/bmesh/tools/bmesh_beautify.h
index 2e7950118c1..a61ae55c3b0 100644
--- a/source/blender/bmesh/tools/bmesh_beautify.h
+++ b/source/blender/bmesh/tools/bmesh_beautify.h
@@ -32,11 +32,11 @@ enum {
*/
void BM_mesh_beautify_fill(BMesh *bm,
BMEdge **edge_array,
- const int edge_array_len,
- const short flag,
- const short method,
- const short oflag_edge,
- const short oflag_face);
+ int edge_array_len,
+ short flag,
+ short method,
+ short oflag_edge,
+ short oflag_face);
/**
* Assuming we have 2 triangles sharing an edge (2 - 4),
@@ -48,5 +48,5 @@ float BM_verts_calc_rotate_beauty(const BMVert *v1,
const BMVert *v2,
const BMVert *v3,
const BMVert *v4,
- const short flag,
- const short method);
+ short flag,
+ short method);
diff --git a/source/blender/bmesh/tools/bmesh_bevel.h b/source/blender/bmesh/tools/bmesh_bevel.h
index 03c10ee9f80..56533e83c39 100644
--- a/source/blender/bmesh/tools/bmesh_bevel.h
+++ b/source/blender/bmesh/tools/bmesh_bevel.h
@@ -36,25 +36,25 @@ struct MDeformVert;
* \warning all tagged edges _must_ be manifold.
*/
void BM_mesh_bevel(BMesh *bm,
- const float offset,
- const int offset_type,
- const int profile_type,
- const int segments,
- const float profile,
- const bool affect_type,
- const bool use_weights,
- const bool limit_offset,
+ float offset,
+ int offset_type,
+ int profile_type,
+ int segments,
+ float profile,
+ bool affect_type,
+ bool use_weights,
+ bool limit_offset,
const struct MDeformVert *dvert,
- const int vertex_group,
- const int mat,
- const bool loop_slide,
- const bool mark_seam,
- const bool mark_sharp,
- const bool harden_normals,
- const int face_strength_mode,
- const int miter_outer,
- const int miter_inner,
- const float spread,
- const float smoothresh,
+ int vertex_group,
+ int mat,
+ bool loop_slide,
+ bool mark_seam,
+ bool mark_sharp,
+ bool harden_normals,
+ int face_strength_mode,
+ int miter_outer,
+ int miter_inner,
+ float spread,
+ float smoothresh,
const struct CurveProfile *custom_profile,
- const int vmesh_method);
+ int vmesh_method);
diff --git a/source/blender/bmesh/tools/bmesh_bisect_plane.h b/source/blender/bmesh/tools/bmesh_bisect_plane.h
index 120935296b7..d3c1c6f4c62 100644
--- a/source/blender/bmesh/tools/bmesh_bisect_plane.h
+++ b/source/blender/bmesh/tools/bmesh_bisect_plane.h
@@ -27,8 +27,8 @@
*/
void BM_mesh_bisect_plane(BMesh *bm,
const float plane[4],
- const bool use_snap_center,
- const bool use_tag,
- const short oflag_center,
- const short oflag_new,
- const float eps);
+ bool use_snap_center,
+ bool use_tag,
+ short oflag_center,
+ short oflag_new,
+ float eps);
diff --git a/source/blender/bmesh/tools/bmesh_boolean.h b/source/blender/bmesh/tools/bmesh_boolean.h
index 4dacc7b1095..f97f49a7470 100644
--- a/source/blender/bmesh/tools/bmesh_boolean.h
+++ b/source/blender/bmesh/tools/bmesh_boolean.h
@@ -26,14 +26,14 @@ extern "C" {
bool BM_mesh_boolean(BMesh *bm,
struct BMLoop *(*looptris)[3],
- const int looptris_tot,
+ int looptris_tot,
int (*test_fn)(BMFace *f, void *user_data),
void *user_data,
- const int nshapes,
- const bool use_self,
- const bool keep_hidden,
- const bool hole_tolerant,
- const int boolean_mode);
+ int nshapes,
+ bool use_self,
+ bool keep_hidden,
+ bool hole_tolerant,
+ int boolean_mode);
/**
* Perform a Knife Intersection operation on the mesh `bm`.
@@ -47,14 +47,14 @@ bool BM_mesh_boolean(BMesh *bm,
*/
bool BM_mesh_boolean_knife(BMesh *bm,
struct BMLoop *(*looptris)[3],
- const int looptris_tot,
+ int looptris_tot,
int (*test_fn)(BMFace *f, void *user_data),
void *user_data,
- const int nshapes,
- const bool use_self,
- const bool use_separate_all,
- const bool hole_tolerant,
- const bool keep_hidden);
+ int nshapes,
+ bool use_self,
+ bool use_separate_all,
+ bool hole_tolerant,
+ bool keep_hidden);
#ifdef __cplusplus
}
diff --git a/source/blender/bmesh/tools/bmesh_decimate.h b/source/blender/bmesh/tools/bmesh_decimate.h
index 1de241a1326..336b653d462 100644
--- a/source/blender/bmesh/tools/bmesh_decimate.h
+++ b/source/blender/bmesh/tools/bmesh_decimate.h
@@ -35,28 +35,28 @@
* - Face normals are not maintained at all.
*/
void BM_mesh_decimate_collapse(BMesh *bm,
- const float factor,
+ float factor,
float *vweights,
float vweight_factor,
- const bool do_triangulate,
- const int symmetry_axis,
- const float symmetry_eps);
+ bool do_triangulate,
+ int symmetry_axis,
+ float symmetry_eps);
/**
* \param tag_only: so we can call this from an operator */
-void BM_mesh_decimate_unsubdivide_ex(BMesh *bm, const int iterations, const bool tag_only);
-void BM_mesh_decimate_unsubdivide(BMesh *bm, const int iterations);
+void BM_mesh_decimate_unsubdivide_ex(BMesh *bm, int iterations, bool tag_only);
+void BM_mesh_decimate_unsubdivide(BMesh *bm, int iterations);
void BM_mesh_decimate_dissolve_ex(BMesh *bm,
- const float angle_limit,
- const bool do_dissolve_boundaries,
+ float angle_limit,
+ bool do_dissolve_boundaries,
BMO_Delimit delimit,
BMVert **vinput_arr,
- const int vinput_len,
+ int vinput_len,
BMEdge **einput_arr,
- const int einput_len,
- const short oflag_out);
+ int einput_len,
+ short oflag_out);
void BM_mesh_decimate_dissolve(BMesh *bm,
- const float angle_limit,
- const bool do_dissolve_boundaries,
+ float angle_limit,
+ bool do_dissolve_boundaries,
const BMO_Delimit delimit);
diff --git a/source/blender/bmesh/tools/bmesh_edgenet.h b/source/blender/bmesh/tools/bmesh_edgenet.h
index 20edb30442c..60e9d9acff1 100644
--- a/source/blender/bmesh/tools/bmesh_edgenet.h
+++ b/source/blender/bmesh/tools/bmesh_edgenet.h
@@ -29,4 +29,4 @@
* \param bm: The mesh to operate on.
* \param use_edge_tag: Only fill tagged edges.
*/
-void BM_mesh_edgenet(BMesh *bm, const bool use_edge_tag, const bool use_new_face_tag);
+void BM_mesh_edgenet(BMesh *bm, bool use_edge_tag, bool use_new_face_tag);
diff --git a/source/blender/bmesh/tools/bmesh_edgesplit.h b/source/blender/bmesh/tools/bmesh_edgesplit.h
index bcbb3ab7857..dd835ba335c 100644
--- a/source/blender/bmesh/tools/bmesh_edgesplit.h
+++ b/source/blender/bmesh/tools/bmesh_edgesplit.h
@@ -29,10 +29,7 @@ extern "C" {
* \param tag_only: Only split tagged edges.
* \param copy_select: Copy selection history.
*/
-void BM_mesh_edgesplit(BMesh *bm,
- const bool use_verts,
- const bool tag_only,
- const bool copy_select);
+void BM_mesh_edgesplit(BMesh *bm, bool use_verts, bool tag_only, bool copy_select);
#ifdef __cplusplus
}
diff --git a/source/blender/bmesh/tools/bmesh_intersect.h b/source/blender/bmesh/tools/bmesh_intersect.h
index a6c91715f31..4fc6460a35f 100644
--- a/source/blender/bmesh/tools/bmesh_intersect.h
+++ b/source/blender/bmesh/tools/bmesh_intersect.h
@@ -34,17 +34,17 @@ extern "C" {
*/
bool BM_mesh_intersect(BMesh *bm,
struct BMLoop *(*looptris)[3],
- const int looptris_tot,
+ int looptris_tot,
int (*test_fn)(BMFace *f, void *user_data),
void *user_data,
- const bool use_self,
- const bool use_separate,
- const bool use_dissolve,
- const bool use_island_connect,
- const bool use_partial_connect,
- const bool use_edge_tag,
- const int boolean_mode,
- const float eps);
+ bool use_self,
+ bool use_separate,
+ bool use_dissolve,
+ bool use_island_connect,
+ bool use_partial_connect,
+ bool use_edge_tag,
+ int boolean_mode,
+ float eps);
enum {
BMESH_ISECT_BOOLEAN_NONE = -1,
diff --git a/source/blender/bmesh/tools/bmesh_intersect_edges.h b/source/blender/bmesh/tools/bmesh_intersect_edges.h
index 2736b7a52f9..cd7293c4a0b 100644
--- a/source/blender/bmesh/tools/bmesh_intersect_edges.h
+++ b/source/blender/bmesh/tools/bmesh_intersect_edges.h
@@ -21,4 +21,4 @@
#pragma once
bool BM_mesh_intersect_edges(
- BMesh *bm, const char hflag, const float dist, const bool split_faces, GHash *r_targetmap);
+ BMesh *bm, char hflag, float dist, bool split_faces, GHash *r_targetmap);
diff --git a/source/blender/bmesh/tools/bmesh_path_region_uv.h b/source/blender/bmesh/tools/bmesh_path_region_uv.h
index 5767c5384e5..2f29ef2a36e 100644
--- a/source/blender/bmesh/tools/bmesh_path_region_uv.h
+++ b/source/blender/bmesh/tools/bmesh_path_region_uv.h
@@ -23,7 +23,7 @@
struct LinkNode *BM_mesh_calc_path_uv_region_vert(BMesh *bm,
BMElem *ele_src,
BMElem *ele_dst,
- const uint cd_loop_uv_offset,
+ uint cd_loop_uv_offset,
bool (*filter_fn)(BMLoop *, void *user_data),
void *user_data) ATTR_WARN_UNUSED_RESULT
ATTR_NONNULL(1, 2, 3);
@@ -31,7 +31,7 @@ struct LinkNode *BM_mesh_calc_path_uv_region_vert(BMesh *bm,
struct LinkNode *BM_mesh_calc_path_uv_region_edge(BMesh *bm,
BMElem *ele_src,
BMElem *ele_dst,
- const uint cd_loop_uv_offset,
+ uint cd_loop_uv_offset,
bool (*filter_fn)(BMLoop *, void *user_data),
void *user_data) ATTR_WARN_UNUSED_RESULT
ATTR_NONNULL(1, 2, 3);
@@ -39,7 +39,7 @@ struct LinkNode *BM_mesh_calc_path_uv_region_edge(BMesh *bm,
struct LinkNode *BM_mesh_calc_path_uv_region_face(BMesh *bm,
BMElem *ele_src,
BMElem *ele_dst,
- const uint cd_loop_uv_offset,
+ uint cd_loop_uv_offset,
bool (*filter_fn)(BMFace *, void *user_data),
void *user_data) ATTR_WARN_UNUSED_RESULT
ATTR_NONNULL(1, 2, 3);
diff --git a/source/blender/bmesh/tools/bmesh_triangulate.h b/source/blender/bmesh/tools/bmesh_triangulate.h
index f45f94f15d8..0d78b6a74b4 100644
--- a/source/blender/bmesh/tools/bmesh_triangulate.h
+++ b/source/blender/bmesh/tools/bmesh_triangulate.h
@@ -23,10 +23,10 @@
#pragma once
void BM_mesh_triangulate(BMesh *bm,
- const int quad_method,
- const int ngon_method,
- const int min_vertices,
- const bool tag_only,
+ int quad_method,
+ int ngon_method,
+ int min_vertices,
+ bool tag_only,
BMOperator *op,
BMOpSlot *slot_facemap_out,
BMOpSlot *slot_facemap_double_out);
diff --git a/source/blender/bmesh/tools/bmesh_wireframe.h b/source/blender/bmesh/tools/bmesh_wireframe.h
index 5b64a16435f..8e523780a67 100644
--- a/source/blender/bmesh/tools/bmesh_wireframe.h
+++ b/source/blender/bmesh/tools/bmesh_wireframe.h
@@ -29,17 +29,17 @@
* \note Behavior matches MOD_solidify.c
*/
void BM_mesh_wireframe(BMesh *bm,
- const float offset,
- const float offset_fac,
- const float offset_fac_vg,
- const bool use_replace,
- const bool use_boundary,
- const bool use_even_offset,
- const bool use_relative_offset,
- const bool use_crease,
- const float crease_weight,
- const int defgrp_index,
- const bool defgrp_invert,
- const short mat_offset,
- const short mat_max,
- const bool use_tag);
+ float offset,
+ float offset_fac,
+ float offset_fac_vg,
+ bool use_replace,
+ bool use_boundary,
+ bool use_even_offset,
+ bool use_relative_offset,
+ bool use_crease,
+ float crease_weight,
+ int defgrp_index,
+ bool defgrp_invert,
+ short mat_offset,
+ short mat_max,
+ bool use_tag);