diff options
Diffstat (limited to 'source/blender/bmesh')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_interp.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/tools/bmesh_bevel.c | 5 | ||||
-rw-r--r-- | source/blender/bmesh/tools/bmesh_decimate_dissolve.c | 5 | ||||
-rw-r--r-- | source/blender/bmesh/tools/bmesh_intersect_edges.c | 2 |
4 files changed, 9 insertions, 5 deletions
diff --git a/source/blender/bmesh/intern/bmesh_interp.c b/source/blender/bmesh/intern/bmesh_interp.c index 4bc7a74a3f7..256ef55ac59 100644 --- a/source/blender/bmesh/intern/bmesh_interp.c +++ b/source/blender/bmesh/intern/bmesh_interp.c @@ -328,7 +328,7 @@ static bool quad_co(const float v1[3], return true; } -static void mdisp_axis_from_quad(float v1[3], +static void mdisp_axis_from_quad(const float v1[3], const float v2[3], float UNUSED(v3[3]), const float v4[3], diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c index 8900d5b8209..8b814240a42 100644 --- a/source/blender/bmesh/tools/bmesh_bevel.c +++ b/source/blender/bmesh/tools/bmesh_bevel.c @@ -1152,7 +1152,8 @@ static int edges_angle_kind(EdgeHalf *e1, EdgeHalf *e2, BMVert *v) /* co should be approximately on the plane between e1 and e2, which share common vert v and common * face f (which cannot be NULL). Is it between those edges, sweeping CCW? */ -static bool point_between_edges(float co[3], BMVert *v, BMFace *f, EdgeHalf *e1, EdgeHalf *e2) +static bool point_between_edges( + const float co[3], BMVert *v, BMFace *f, EdgeHalf *e1, EdgeHalf *e2) { BMVert *v1, *v2; float dir1[3], dir2[3], dirco[3], no[3]; @@ -4857,7 +4858,7 @@ static void build_square_in_vmesh(BevelParams *bp, BMesh *bm, BevVert *bv, VMesh /** * Copy whichever of \a a and \a b is closer to v into \a r. */ -static void closer_v3_v3v3v3(float r[3], float a[3], float b[3], float v[3]) +static void closer_v3_v3v3v3(float r[3], const float a[3], const float b[3], const float v[3]) { if (len_squared_v3v3(a, v) <= len_squared_v3v3(b, v)) { copy_v3_v3(r, a); diff --git a/source/blender/bmesh/tools/bmesh_decimate_dissolve.c b/source/blender/bmesh/tools/bmesh_decimate_dissolve.c index 3ed27ea580e..94a578fe1d7 100644 --- a/source/blender/bmesh/tools/bmesh_decimate_dissolve.c +++ b/source/blender/bmesh/tools/bmesh_decimate_dissolve.c @@ -171,7 +171,10 @@ static float bm_edge_calc_dissolve_error(const BMEdge *e, #ifdef USE_DEGENERATE_CHECK -static void mul_v2_m3v3_center(float r[2], float m[3][3], const float a[3], const float center[3]) +static void mul_v2_m3v3_center(float r[2], + const float m[3][3], + const float a[3], + const float center[3]) { BLI_assert(r != a); BLI_assert(r != center); diff --git a/source/blender/bmesh/tools/bmesh_intersect_edges.c b/source/blender/bmesh/tools/bmesh_intersect_edges.c index 52231033fd3..5e266fdac0e 100644 --- a/source/blender/bmesh/tools/bmesh_intersect_edges.c +++ b/source/blender/bmesh/tools/bmesh_intersect_edges.c @@ -455,7 +455,7 @@ static void bm_elemxelem_bvhtree_overlap(const BVHTree *tree1, int parallel_tasks_num = BLI_bvhtree_overlap_thread_num(tree1); for (int i = 0; i < parallel_tasks_num; i++) { if (pair_stack[i] == NULL) { - pair_stack[i] = BLI_stack_new(sizeof(struct EDBMSplitElem[2]), __func__); + pair_stack[i] = BLI_stack_new(sizeof(const struct EDBMSplitElem[2]), __func__); } } data->pair_stack = pair_stack; |