From 48e089375ebe4aeb30d60e9d8ef6f467280cf07d Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 7 Aug 2020 22:56:13 +1000 Subject: Cleanup: pass arrays const where possible --- source/blender/blenkernel/intern/cloth.c | 2 +- source/blender/blenkernel/intern/constraint.c | 2 +- source/blender/blenkernel/intern/curve.c | 5 ++- source/blender/blenkernel/intern/dynamicpaint.c | 2 +- source/blender/blenkernel/intern/fluid.c | 2 +- source/blender/blenkernel/intern/gpencil_curve.c | 2 +- source/blender/blenkernel/intern/mask.c | 3 +- .../intern/multires_reshape_apply_base.c | 2 +- source/blender/blenkernel/intern/object_dupli.c | 5 ++- source/blender/blenkernel/intern/particle_child.c | 2 +- source/blender/blenkernel/intern/softbody.c | 6 +-- source/blender/blenlib/intern/math_geom.c | 4 +- source/blender/blenlib/intern/voronoi_2d.c | 6 ++- source/blender/bmesh/intern/bmesh_interp.c | 2 +- source/blender/bmesh/tools/bmesh_bevel.c | 5 ++- .../blender/bmesh/tools/bmesh_decimate_dissolve.c | 5 ++- source/blender/bmesh/tools/bmesh_intersect_edges.c | 2 +- source/blender/datatoc/datatoc_icon.c | 2 +- .../blender/draw/engines/eevee/eevee_lightcache.c | 2 +- .../draw/engines/overlay/overlay_armature.c | 2 +- .../draw/engines/overlay/overlay_edit_text.c | 2 +- .../blender/draw/intern/draw_cache_extract_mesh.c | 6 ++- source/blender/editors/curve/editcurve.c | 5 ++- source/blender/editors/gpencil/annotate_paint.c | 2 +- source/blender/editors/gpencil/gpencil_paint.c | 4 +- source/blender/editors/gpencil/gpencil_primitive.c | 5 ++- source/blender/editors/gpencil/gpencil_utils.c | 6 ++- .../interface/interface_eyedropper_gpencil_color.c | 9 ++-- source/blender/editors/mesh/editmesh_rip.c | 7 +++- source/blender/editors/sculpt_paint/paint_cursor.c | 2 +- .../editors/sculpt_paint/paint_image_proj.c | 4 +- source/blender/editors/sculpt_paint/paint_mask.c | 2 +- source/blender/editors/sculpt_paint/paint_stroke.c | 5 ++- source/blender/editors/sculpt_paint/paint_utils.c | 2 +- source/blender/editors/space_clip/clip_buttons.c | 2 +- .../editors/space_clip/clip_dopesheet_draw.c | 4 +- source/blender/editors/space_clip/clip_graph_ops.c | 4 +- .../blender/editors/space_clip/tracking_select.c | 4 +- source/blender/editors/space_nla/nla_draw.c | 2 +- .../editors/space_node/node_relationships.c | 2 +- source/blender/editors/space_view3d/drawobject.c | 2 +- source/blender/editors/space_view3d/view3d_edit.c | 5 ++- .../editors/space_view3d/view3d_placement.c | 4 +- .../editors/transform/transform_constraints.c | 2 +- source/blender/editors/transform/transform_mode.c | 4 +- .../transform/transform_mode_bbone_resize.c | 5 ++- .../editors/transform/transform_snap_object.c | 8 ++-- .../blender/editors/uvedit/uvedit_parametrizer.c | 2 +- .../blender/editors/uvedit/uvedit_smart_stitch.c | 5 ++- source/blender/modifiers/intern/MOD_skin.c | 2 +- source/blender/modifiers/intern/MOD_uvwarp.c | 4 +- .../nodes/texture/nodes/node_texture_rotate.c | 2 +- .../blender/simulation/intern/implicit_blender.c | 48 ++++++++++++++-------- source/blender/windowmanager/intern/wm_cursors.c | 2 +- 54 files changed, 149 insertions(+), 88 deletions(-) (limited to 'source/blender') diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c index aa534250554..027761335b0 100644 --- a/source/blender/blenkernel/intern/cloth.c +++ b/source/blender/blenkernel/intern/cloth.c @@ -1355,7 +1355,7 @@ BLI_INLINE void cross_identity_v3(float r[3][3], const float v[3]) r[2][1] = -v[0]; } -BLI_INLINE void madd_m3_m3fl(float r[3][3], float m[3][3], float f) +BLI_INLINE void madd_m3_m3fl(float r[3][3], const float m[3][3], float f) { r[0][0] += m[0][0] * f; r[0][1] += m[0][1] * f; diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index 2bd8713a292..87d1b2561a9 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -2404,7 +2404,7 @@ static void armdef_get_tarmat(struct Depsgraph *UNUSED(depsgraph), } } -static void armdef_accumulate_matrix(float obmat[4][4], +static void armdef_accumulate_matrix(const float obmat[4][4], const float iobmat[4][4], const float basemat[4][4], const float bonemat[4][4], diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index 735ffdea86e..8e03f61d601 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -3598,7 +3598,10 @@ static void bezier_clamp( } /* write changes to a bezier handle */ -static void bezier_output_handle_inner(BezTriple *bezt, bool right, float newval[3], bool endpoint) +static void bezier_output_handle_inner(BezTriple *bezt, + bool right, + const float newval[3], + bool endpoint) { float tmp[3]; diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index b017f3b179f..a39f2ccb6d8 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -602,7 +602,7 @@ static bool boundIntersectPoint(Bounds3D *b, const float point[3], const float r } /* expand bounds by a new point */ -static void boundInsert(Bounds3D *b, float point[3]) +static void boundInsert(Bounds3D *b, const float point[3]) { if (!b->valid) { copy_v3_v3(b->min, point); diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c index 8aebbbefb31..b37d940195e 100644 --- a/source/blender/blenkernel/intern/fluid.c +++ b/source/blender/blenkernel/intern/fluid.c @@ -655,7 +655,7 @@ typedef struct FluidObjectBB { int total_cells, valid; } FluidObjectBB; -static void bb_boundInsert(FluidObjectBB *bb, float point[3]) +static void bb_boundInsert(FluidObjectBB *bb, const float point[3]) { int i = 0; if (!bb->valid) { diff --git a/source/blender/blenkernel/intern/gpencil_curve.c b/source/blender/blenkernel/intern/gpencil_curve.c index a7adbed6c4b..3e568bd5e1e 100644 --- a/source/blender/blenkernel/intern/gpencil_curve.c +++ b/source/blender/blenkernel/intern/gpencil_curve.c @@ -50,7 +50,7 @@ #include "DEG_depsgraph_query.h" /* Helper: Check materials with same color. */ -static int gpencil_check_same_material_color(Object *ob_gp, float color[4], Material **r_mat) +static int gpencil_check_same_material_color(Object *ob_gp, const float color[4], Material **r_mat) { Material *ma = NULL; float color_cu[4]; diff --git a/source/blender/blenkernel/intern/mask.c b/source/blender/blenkernel/intern/mask.c index faaaafc391d..444ed0c65b5 100644 --- a/source/blender/blenkernel/intern/mask.c +++ b/source/blender/blenkernel/intern/mask.c @@ -1512,7 +1512,8 @@ static void mask_layer_shape_from_mask_point(BezTriple *bezt, fp[7] = bezt->radius; } -static void mask_layer_shape_to_mask_point(BezTriple *bezt, float fp[MASK_OBJECT_SHAPE_ELEM_SIZE]) +static void mask_layer_shape_to_mask_point(BezTriple *bezt, + const float fp[MASK_OBJECT_SHAPE_ELEM_SIZE]) { copy_v2_v2(bezt->vec[0], &fp[0]); copy_v2_v2(bezt->vec[1], &fp[2]); diff --git a/source/blender/blenkernel/intern/multires_reshape_apply_base.c b/source/blender/blenkernel/intern/multires_reshape_apply_base.c index 105e56e4219..10a43a4c9b8 100644 --- a/source/blender/blenkernel/intern/multires_reshape_apply_base.c +++ b/source/blender/blenkernel/intern/multires_reshape_apply_base.c @@ -72,7 +72,7 @@ void multires_reshape_apply_base_update_mesh_coords(MultiresReshapeContext *resh /* Assumes no is normalized; return value's sign is negative if v is on the other side of the * plane. */ -static float v3_dist_from_plane(float v[3], float center[3], float no[3]) +static float v3_dist_from_plane(const float v[3], const float center[3], const float no[3]) { float s[3]; sub_v3_v3v3(s, v, center); diff --git a/source/blender/blenkernel/intern/object_dupli.c b/source/blender/blenkernel/intern/object_dupli.c index dac9b1f1cfe..f485f3d2419 100644 --- a/source/blender/blenkernel/intern/object_dupli.c +++ b/source/blender/blenkernel/intern/object_dupli.c @@ -144,7 +144,10 @@ static void copy_dupli_context( /* generate a dupli instance * mat is transform of the object relative to current context (including object obmat) */ -static DupliObject *make_dupli(const DupliContext *ctx, Object *ob, float mat[4][4], int index) +static DupliObject *make_dupli(const DupliContext *ctx, + Object *ob, + const float mat[4][4], + int index) { DupliObject *dob; int i; diff --git a/source/blender/blenkernel/intern/particle_child.c b/source/blender/blenkernel/intern/particle_child.c index 29f6194d404..da5fdc85561 100644 --- a/source/blender/blenkernel/intern/particle_child.c +++ b/source/blender/blenkernel/intern/particle_child.c @@ -684,7 +684,7 @@ static void do_rough(const float loc[3], } static void do_rough_end( - const float loc[3], float mat[4][4], float t, float fac, float shape, ParticleKey *state) + const float loc[3], const float mat[4][4], float t, float fac, float shape, ParticleKey *state) { float rough[2]; float roughfac; diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index a66cba1f01a..1d56db3779a 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -1051,7 +1051,7 @@ static int sb_detect_aabb_collisionCached(float UNUSED(force[3]), /* --- the aabb section*/ /* +++ the face external section*/ -static int sb_detect_face_pointCached(float face_v1[3], +static int sb_detect_face_pointCached(const float face_v1[3], const float face_v2[3], const float face_v3[3], float *damp, @@ -1149,7 +1149,7 @@ static int sb_detect_face_pointCached(float face_v1[3], return deflected; } -static int sb_detect_face_collisionCached(float face_v1[3], +static int sb_detect_face_collisionCached(const float face_v1[3], const float face_v2[3], const float face_v3[3], float *damp, @@ -1328,7 +1328,7 @@ static void scan_for_ext_face_forces(Object *ob, float timenow) /* +++ the spring external section*/ -static int sb_detect_edge_collisionCached(float edge_v1[3], +static int sb_detect_edge_collisionCached(const float edge_v1[3], const float edge_v2[3], float *damp, float force[3], diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c index eff58f305d2..7717c2f26ff 100644 --- a/source/blender/blenlib/intern/math_geom.c +++ b/source/blender/blenlib/intern/math_geom.c @@ -3418,7 +3418,7 @@ static bool point_in_slice(const float p[3], /* adult sister defining the slice planes by the origin and the normal * NOTE |normal| may not be 1 but defining the thickness of the slice */ -static bool point_in_slice_as(float p[3], float origin[3], float normal[3]) +static bool point_in_slice_as(const float p[3], const float origin[3], const float normal[3]) { float h, rp[3]; sub_v3_v3v3(rp, p, origin); @@ -4910,7 +4910,7 @@ void projmat_from_subregion(const float projmat[4][4], } } -static void i_multmatrix(float icand[4][4], float Vm[4][4]) +static void i_multmatrix(const float icand[4][4], float Vm[4][4]) { int row, col; float temp[4][4]; diff --git a/source/blender/blenlib/intern/voronoi_2d.c b/source/blender/blenlib/intern/voronoi_2d.c index bc11a2c7a1c..5b998973a20 100644 --- a/source/blender/blenlib/intern/voronoi_2d.c +++ b/source/blender/blenlib/intern/voronoi_2d.c @@ -83,7 +83,9 @@ static void voronoi_insertEvent(VoronoiProcess *process, VoronoiEvent *event) } /* edge */ -static VoronoiEdge *voronoiEdge_new(float start[2], float left[2], float right[2]) +static VoronoiEdge *voronoiEdge_new(const float start[2], + const float left[2], + const float right[2]) { VoronoiEdge *edge = MEM_callocN(sizeof(VoronoiEdge), "voronoi edge"); @@ -118,7 +120,7 @@ static VoronoiParabola *voronoiParabola_new(void) return parabola; } -static VoronoiParabola *voronoiParabola_newSite(float site[2]) +static VoronoiParabola *voronoiParabola_newSite(const float site[2]) { VoronoiParabola *parabola = MEM_callocN(sizeof(VoronoiParabola), "voronoi parabola site"); 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; diff --git a/source/blender/datatoc/datatoc_icon.c b/source/blender/datatoc/datatoc_icon.c index 80a335e22b7..4a9c5875c17 100644 --- a/source/blender/datatoc/datatoc_icon.c +++ b/source/blender/datatoc/datatoc_icon.c @@ -269,7 +269,7 @@ static bool icon_merge(const char *file_src, /* init once */ *r_canvas_w = head.canvas_w; *r_canvas_h = head.canvas_h; - *r_pixels_canvas = calloc(1, (head.canvas_w * head.canvas_h) * sizeof(unsigned char[4])); + *r_pixels_canvas = calloc(1, (head.canvas_w * head.canvas_h) * sizeof(const unsigned char[4])); } canvas_w = *r_canvas_w; diff --git a/source/blender/draw/engines/eevee/eevee_lightcache.c b/source/blender/draw/engines/eevee/eevee_lightcache.c index cb41d3dbd8d..6d2577d5b78 100644 --- a/source/blender/draw/engines/eevee/eevee_lightcache.c +++ b/source/blender/draw/engines/eevee/eevee_lightcache.c @@ -1031,7 +1031,7 @@ static void compute_cell_id(EEVEE_LightGrid *egrid, BLI_assert(0); } -static void grid_loc_to_world_loc(EEVEE_LightGrid *egrid, int local_cell[3], float r_pos[3]) +static void grid_loc_to_world_loc(EEVEE_LightGrid *egrid, const int local_cell[3], float r_pos[3]) { copy_v3_v3(r_pos, egrid->corner); madd_v3_v3fl(r_pos, egrid->increment_x, local_cell[0]); diff --git a/source/blender/draw/engines/overlay/overlay_armature.c b/source/blender/draw/engines/overlay/overlay_armature.c index 6638f8e9e2e..49b8257e0c6 100644 --- a/source/blender/draw/engines/overlay/overlay_armature.c +++ b/source/blender/draw/engines/overlay/overlay_armature.c @@ -1078,7 +1078,7 @@ static void edbo_compute_bbone_child(bArmature *arm) } /* A version of BKE_pchan_bbone_spline_setup() for previewing editmode curve settings. */ -static void ebone_spline_preview(EditBone *ebone, float result_array[MAX_BBONE_SUBDIV][4][4]) +static void ebone_spline_preview(EditBone *ebone, const float result_array[MAX_BBONE_SUBDIV][4][4]) { BBoneSplineParameters param; EditBone *prev, *next; diff --git a/source/blender/draw/engines/overlay/overlay_edit_text.c b/source/blender/draw/engines/overlay/overlay_edit_text.c index 6ddd0e6d9be..fd68b319f02 100644 --- a/source/blender/draw/engines/overlay/overlay_edit_text.c +++ b/source/blender/draw/engines/overlay/overlay_edit_text.c @@ -74,7 +74,7 @@ void OVERLAY_edit_text_cache_init(OVERLAY_Data *vedata) /* Use 2D quad corners to create a matrix that set * a [-1..1] quad at the right position. */ -static void v2_quad_corners_to_mat4(float corners[4][2], float r_mat[4][4]) +static void v2_quad_corners_to_mat4(const float corners[4][2], float r_mat[4][4]) { unit_m4(r_mat); sub_v2_v2v2(r_mat[0], corners[1], corners[0]); diff --git a/source/blender/draw/intern/draw_cache_extract_mesh.c b/source/blender/draw/intern/draw_cache_extract_mesh.c index a1d2a7eeb4a..a22d4cc95a2 100644 --- a/source/blender/draw/intern/draw_cache_extract_mesh.c +++ b/source/blender/draw/intern/draw_cache_extract_mesh.c @@ -3611,12 +3611,14 @@ static void compute_normalize_edge_vectors(float auv[2][2], normalize_v3(av[1]); } -static short v2_to_short_angle(float v[2]) +static short v2_to_short_angle(const float v[2]) { return atan2f(v[1], v[0]) * (float)M_1_PI * SHRT_MAX; } -static void edituv_get_stretch_angle(float auv[2][2], float av[2][3], UVStretchAngle *r_stretch) +static void edituv_get_stretch_angle(float auv[2][2], + const float av[2][3], + UVStretchAngle *r_stretch) { /* Send UV's to the shader and let it compute the aspect corrected angle. */ r_stretch->uv_angles[0] = v2_to_short_angle(auv[0]); diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 72ea52314b9..69a05c9ae31 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -1716,7 +1716,10 @@ static bool isNurbselV(Nurb *nu, int *u, int flag) return 1; } -static void rotateflagNurb(ListBase *editnurb, short flag, const float cent[3], float rotmat[3][3]) +static void rotateflagNurb(ListBase *editnurb, + short flag, + const float cent[3], + const float rotmat[3][3]) { /* all verts with (flag & 'flag') rotate */ Nurb *nu; diff --git a/source/blender/editors/gpencil/annotate_paint.c b/source/blender/editors/gpencil/annotate_paint.c index b45a324bc67..30e4fe0b531 100644 --- a/source/blender/editors/gpencil/annotate_paint.c +++ b/source/blender/editors/gpencil/annotate_paint.c @@ -271,7 +271,7 @@ static void annotation_get_3d_reference(tGPsdata *p, float vec[3]) /* Stroke Editing ---------------------------- */ /* check if the current mouse position is suitable for adding a new point */ -static bool annotation_stroke_filtermval(tGPsdata *p, const float mval[2], float pmval[2]) +static bool annotation_stroke_filtermval(tGPsdata *p, const float mval[2], const float pmval[2]) { int dx = (int)fabsf(mval[0] - pmval[0]); int dy = (int)fabsf(mval[1] - pmval[1]); diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index de58a0916b2..611fe158948 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -362,7 +362,7 @@ static void gpencil_get_3d_reference(tGPsdata *p, float vec[3]) /* Stroke Editing ---------------------------- */ /* check if the current mouse position is suitable for adding a new point */ -static bool gpencil_stroke_filtermval(tGPsdata *p, const float mval[2], float mvalo[2]) +static bool gpencil_stroke_filtermval(tGPsdata *p, const float mval[2], const float mvalo[2]) { Brush *brush = p->brush; int dx = (int)fabsf(mval[0] - mvalo[0]); @@ -3269,7 +3269,7 @@ static void gpencil_brush_angle_segment(tGPsdata *p, tGPspoint *pt_prev, tGPspoi * + PtA - 1 * / * CTL is the vertice of the triangle created between PtA and PtB */ -static void gpencil_add_arc_points(tGPsdata *p, float mval[2], int segments) +static void gpencil_add_arc_points(tGPsdata *p, const float mval[2], int segments) { bGPdata *gpd = p->gpd; BrushGpencilSettings *brush_settings = p->brush->gpencil_settings; diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c index f44dbd1a752..28ea9535a80 100644 --- a/source/blender/editors/gpencil/gpencil_primitive.c +++ b/source/blender/editors/gpencil/gpencil_primitive.c @@ -378,7 +378,10 @@ static void gpencil_primitive_add_segment(tGPDprimitive *tgpi) } /* Helper: set control point */ -static void gpencil_primitive_set_cp(tGPDprimitive *tgpi, float p[2], float color[4], int size) +static void gpencil_primitive_set_cp(tGPDprimitive *tgpi, + const float p[2], + float color[4], + int size) { if (tgpi->flag == IN_PROGRESS) { return; diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c index 339e97bd71c..aaf88e1a0b0 100644 --- a/source/blender/editors/gpencil/gpencil_utils.c +++ b/source/blender/editors/gpencil/gpencil_utils.c @@ -1723,7 +1723,7 @@ void ED_gpencil_vgroup_deselect(bContext *C, Object *ob) /* Cursor drawing */ /* check if cursor is in drawing region */ -static bool gpencil_check_cursor_region(bContext *C, int mval_i[2]) +static bool gpencil_check_cursor_region(bContext *C, const int mval_i[2]) { ARegion *region = CTX_wm_region(C); ScrArea *area = CTX_wm_area(C); @@ -2311,7 +2311,9 @@ static void gpencil_insert_point( MEM_SAFE_FREE(temp_points); } -static float gpencil_calc_factor(float p2d_a1[2], float p2d_a2[2], float r_hit2d[2]) +static float gpencil_calc_factor(const float p2d_a1[2], + const float p2d_a2[2], + const float r_hit2d[2]) { float dist1 = len_squared_v2v2(p2d_a1, p2d_a2); float dist2 = len_squared_v2v2(p2d_a1, r_hit2d); diff --git a/source/blender/editors/interface/interface_eyedropper_gpencil_color.c b/source/blender/editors/interface/interface_eyedropper_gpencil_color.c index 978d8ac09de..aa5b4d2c255 100644 --- a/source/blender/editors/interface/interface_eyedropper_gpencil_color.c +++ b/source/blender/editors/interface/interface_eyedropper_gpencil_color.c @@ -106,8 +106,11 @@ static void eyedropper_gpencil_exit(bContext *C, wmOperator *op) MEM_SAFE_FREE(op->customdata); } -static void eyedropper_add_material( - bContext *C, float col_conv[4], const bool only_stroke, const bool only_fill, const bool both) +static void eyedropper_add_material(bContext *C, + const float col_conv[4], + const bool only_stroke, + const bool only_fill, + const bool both) { Main *bmain = CTX_data_main(C); Object *ob = CTX_data_active_object(C); @@ -193,7 +196,7 @@ static void eyedropper_add_material( } /* Create a new palette color and palette if needed. */ -static void eyedropper_add_palette_color(bContext *C, float col_conv[4]) +static void eyedropper_add_palette_color(bContext *C, const float col_conv[4]) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); diff --git a/source/blender/editors/mesh/editmesh_rip.c b/source/blender/editors/mesh/editmesh_rip.c index 89a90dcf12d..62c646a81e4 100644 --- a/source/blender/editors/mesh/editmesh_rip.c +++ b/source/blender/editors/mesh/editmesh_rip.c @@ -343,8 +343,11 @@ static BMVert *edbm_ripsel_edloop_pair_start_vert(BMEdge *e) return (edbm_ripsel_edge_uid_step(e, &v_test)) ? e->v1 : e->v2; } -static void edbm_ripsel_deselect_helper( - BMesh *bm, EdgeLoopPair *eloop_pairs, ARegion *region, float projectMat[4][4], float fmval[2]) +static void edbm_ripsel_deselect_helper(BMesh *bm, + EdgeLoopPair *eloop_pairs, + ARegion *region, + float projectMat[4][4], + const float fmval[2]) { EdgeLoopPair *lp; diff --git a/source/blender/editors/sculpt_paint/paint_cursor.c b/source/blender/editors/sculpt_paint/paint_cursor.c index e559d2120e2..f0d01305e96 100644 --- a/source/blender/editors/sculpt_paint/paint_cursor.c +++ b/source/blender/editors/sculpt_paint/paint_cursor.c @@ -875,7 +875,7 @@ BLI_INLINE void draw_rect_point(uint pos, imm_draw_box_wire_2d(pos, minx, miny, maxx, maxy); } -BLI_INLINE void draw_bezier_handle_lines(uint pos, float sel_col[4], BezTriple *bez) +BLI_INLINE void draw_bezier_handle_lines(uint pos, const float sel_col[4], BezTriple *bez) { immUniformColor4f(0.0f, 0.0f, 0.0f, 0.5f); GPU_line_width(3.0f); diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index fa9a0854112..d16c66848b8 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -2928,7 +2928,7 @@ static void project_bucket_clip_face(const bool is_ortho, /* checks if pt is inside a convex 2D polyline, the polyline must be ordered rotating clockwise * otherwise it would have to test for mixed (line_point_side_v2 > 0.0f) cases */ -static bool IsectPoly2Df(const float pt[2], float uv[][2], const int tot) +static bool IsectPoly2Df(const float pt[2], const float uv[][2], const int tot) { int i; if (line_point_side_v2(uv[tot - 1], uv[0], pt) < 0.0f) { @@ -2943,7 +2943,7 @@ static bool IsectPoly2Df(const float pt[2], float uv[][2], const int tot) return true; } -static bool IsectPoly2Df_twoside(const float pt[2], float uv[][2], const int tot) +static bool IsectPoly2Df_twoside(const float pt[2], const float uv[][2], const int tot) { const bool side = (line_point_side_v2(uv[tot - 1], uv[0], pt) > 0.0f); diff --git a/source/blender/editors/sculpt_paint/paint_mask.c b/source/blender/editors/sculpt_paint/paint_mask.c index c255cbcaaab..7e5825835fb 100644 --- a/source/blender/editors/sculpt_paint/paint_mask.c +++ b/source/blender/editors/sculpt_paint/paint_mask.c @@ -389,7 +389,7 @@ typedef struct LassoMaskData { * Lasso select. This could be defined as part of #VIEW3D_OT_select_lasso, * still the shortcuts conflict, so we will use a separate operator. */ -static bool is_effected_lasso(LassoMaskData *data, float co[3]) +static bool is_effected_lasso(LassoMaskData *data, const float co[3]) { float scr_co_f[2]; int scr_co_s[2]; diff --git a/source/blender/editors/sculpt_paint/paint_stroke.c b/source/blender/editors/sculpt_paint/paint_stroke.c index b9361726826..38a09cd97bd 100644 --- a/source/blender/editors/sculpt_paint/paint_stroke.c +++ b/source/blender/editors/sculpt_paint/paint_stroke.c @@ -1198,7 +1198,10 @@ static void paint_line_strokes_spacing(bContext *C, *length_residue = length; } -static void paint_stroke_line_end(bContext *C, wmOperator *op, PaintStroke *stroke, float mouse[2]) +static void paint_stroke_line_end(bContext *C, + wmOperator *op, + PaintStroke *stroke, + const float mouse[2]) { Brush *br = stroke->brush; if (stroke->stroke_started && (br->flag & BRUSH_LINE)) { diff --git a/source/blender/editors/sculpt_paint/paint_utils.c b/source/blender/editors/sculpt_paint/paint_utils.c index af5afa80eb8..b7e5a73cbb3 100644 --- a/source/blender/editors/sculpt_paint/paint_utils.c +++ b/source/blender/editors/sculpt_paint/paint_utils.c @@ -238,7 +238,7 @@ void paint_stroke_operator_properties(wmOperatorType *ot) /* 3D Paint */ -static void imapaint_project(float matrix[4][4], const float co[3], float pco[4]) +static void imapaint_project(const float matrix[4][4], const float co[3], float pco[4]) { copy_v3_v3(pco, co); pco[3] = 1.0f; diff --git a/source/blender/editors/space_clip/clip_buttons.c b/source/blender/editors/space_clip/clip_buttons.c index 71f75d96cb1..80ce07d39ef 100644 --- a/source/blender/editors/space_clip/clip_buttons.c +++ b/source/blender/editors/space_clip/clip_buttons.c @@ -273,7 +273,7 @@ typedef struct { int marker_flag; } MarkerUpdateCb; -static void to_pixel_space(float r[2], float a[2], int width, int height) +static void to_pixel_space(float r[2], const float a[2], int width, int height) { copy_v2_v2(r, a); r[0] *= width; diff --git a/source/blender/editors/space_clip/clip_dopesheet_draw.c b/source/blender/editors/space_clip/clip_dopesheet_draw.c index c3aca95910b..c7328ae9f8f 100644 --- a/source/blender/editors/space_clip/clip_dopesheet_draw.c +++ b/source/blender/editors/space_clip/clip_dopesheet_draw.c @@ -49,7 +49,9 @@ #include "clip_intern.h" /* own include */ -static void track_channel_color(MovieTrackingTrack *track, float default_color[3], float color[3]) +static void track_channel_color(MovieTrackingTrack *track, + const float default_color[3], + float color[3]) { if (track->flag & TRACK_CUSTOMCOLOR) { float bg[3]; diff --git a/source/blender/editors/space_clip/clip_graph_ops.c b/source/blender/editors/space_clip/clip_graph_ops.c index 63d9889e662..ffd3241a30f 100644 --- a/source/blender/editors/space_clip/clip_graph_ops.c +++ b/source/blender/editors/space_clip/clip_graph_ops.c @@ -178,7 +178,7 @@ static void mouse_select_init_data(bContext *C, MouseSelectUserData *userdata, c copy_v2_v2(userdata->mouse_co, co); } -static bool mouse_select_knot(bContext *C, float co[2], bool extend) +static bool mouse_select_knot(bContext *C, const float co[2], bool extend) { SpaceClip *sc = CTX_wm_space_clip(C); MovieClip *clip = ED_space_clip_get_clip(sc); @@ -236,7 +236,7 @@ static bool mouse_select_knot(bContext *C, float co[2], bool extend) return false; } -static bool mouse_select_curve(bContext *C, float co[2], bool extend) +static bool mouse_select_curve(bContext *C, const float co[2], bool extend) { SpaceClip *sc = CTX_wm_space_clip(C); MovieClip *clip = ED_space_clip_get_clip(sc); diff --git a/source/blender/editors/space_clip/tracking_select.c b/source/blender/editors/space_clip/tracking_select.c index 615d09a04b2..80d0dd773b2 100644 --- a/source/blender/editors/space_clip/tracking_select.c +++ b/source/blender/editors/space_clip/tracking_select.c @@ -744,7 +744,9 @@ static int point_inside_ellipse(const float point[2], return x * x + y * y < 1.0f; } -static int marker_inside_ellipse(MovieTrackingMarker *marker, float offset[2], float ellipse[2]) +static int marker_inside_ellipse(MovieTrackingMarker *marker, + const float offset[2], + const float ellipse[2]) { return point_inside_ellipse(marker->pos, offset, ellipse); } diff --git a/source/blender/editors/space_nla/nla_draw.c b/source/blender/editors/space_nla/nla_draw.c index 96599fd92a7..97939a93d01 100644 --- a/source/blender/editors/space_nla/nla_draw.c +++ b/source/blender/editors/space_nla/nla_draw.c @@ -378,7 +378,7 @@ static void nla_draw_strip_curves(NlaStrip *strip, float yminc, float ymaxc, uin } /* helper call to setup dashed-lines for strip outlines */ -static uint nla_draw_use_dashed_outlines(float color[4], bool muted) +static uint nla_draw_use_dashed_outlines(const float color[4], bool muted) { /* Note that we use dashed shader here, and make it draw solid lines if not muted... */ uint shdr_pos = GPU_vertformat_attr_add( diff --git a/source/blender/editors/space_node/node_relationships.c b/source/blender/editors/space_node/node_relationships.c index 9110d82fb84..a09c70b794a 100644 --- a/source/blender/editors/space_node/node_relationships.c +++ b/source/blender/editors/space_node/node_relationships.c @@ -1004,7 +1004,7 @@ void NODE_OT_link_make(wmOperatorType *ot) } /* ********************** Cut Link operator ***************** */ -static bool cut_links_intersect(bNodeLink *link, float mcoords[][2], int tot) +static bool cut_links_intersect(bNodeLink *link, const float mcoords[][2], int tot) { float coord_array[NODE_LINK_RESOL + 1][2]; int i, b; diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index f17d7ccd136..1ffa653372c 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -69,7 +69,7 @@ static const float cosval[CIRCLE_RESOL] = { 0.82076344, 0.91895781, 0.97952994, 1.00000000, }; -static void circball_array_fill(float verts[CIRCLE_RESOL][3], +static void circball_array_fill(const float verts[CIRCLE_RESOL][3], const float cent[3], float rad, const float tmat[4][4]) diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 19aa9cb203b..ac9d12cdd58 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -2500,7 +2500,10 @@ static bool viewdolly_offset_lock_check(bContext *C, wmOperator *op) return false; } -static void view_dolly_to_vector_3d(ARegion *region, float orig_ofs[3], float dvec[3], float dfac) +static void view_dolly_to_vector_3d(ARegion *region, + const float orig_ofs[3], + const float dvec[3], + float dfac) { RegionView3D *rv3d = region->regiondata; madd_v3_v3v3fl(rv3d->ofs, orig_ofs, dvec, -(1.0f - dfac)); diff --git a/source/blender/editors/space_view3d/view3d_placement.c b/source/blender/editors/space_view3d/view3d_placement.c index b79632f0a82..a828dbc2ee0 100644 --- a/source/blender/editors/space_view3d/view3d_placement.c +++ b/source/blender/editors/space_view3d/view3d_placement.c @@ -246,7 +246,7 @@ static bool idp_poject_surface_normal(SnapObjectContext *snap_context, /** \name Primitive Drawing (Cube, Cone, Cylinder...) * \{ */ -static void draw_line_loop(float coords[][3], int coords_len, const float color[4]) +static void draw_line_loop(const float coords[][3], int coords_len, const float color[4]) { GPUVertFormat *format = immVertexFormat(); uint pos = GPU_vertformat_attr_add(format, "pos", GPU_COMP_F32, 3, GPU_FETCH_FLOAT); @@ -279,7 +279,7 @@ static void draw_line_loop(float coords[][3], int coords_len, const float color[ GPU_blend(false); } -static void draw_line_pairs(float coords_a[][3], +static void draw_line_pairs(const float coords_a[][3], float coords_b[][3], int coords_len, const float color[4]) diff --git a/source/blender/editors/transform/transform_constraints.c b/source/blender/editors/transform/transform_constraints.c index e15239f37d4..d0e37f22236 100644 --- a/source/blender/editors/transform/transform_constraints.c +++ b/source/blender/editors/transform/transform_constraints.c @@ -388,7 +388,7 @@ void transform_constraint_snap_axis_to_face(const TransInfo *t, * Return true if the 2x axis are both aligned when projected into the view. * In this case, we can't usefully project the cursor onto the plane. */ -static bool isPlaneProjectionViewAligned(const TransInfo *t, float plane[4]) +static bool isPlaneProjectionViewAligned(const TransInfo *t, const float plane[4]) { const float eps = 0.001f; float view_to_plane[3]; diff --git a/source/blender/editors/transform/transform_mode.c b/source/blender/editors/transform/transform_mode.c index 38d49ab5efd..495c21bc755 100644 --- a/source/blender/editors/transform/transform_mode.c +++ b/source/blender/editors/transform/transform_mode.c @@ -178,7 +178,7 @@ static void protectedRotateBits(short protectflag, float eul[3], const float old /* this function only does the delta rotation */ /* axis-angle is usually internally stored as quats... */ static void protectedAxisAngleBits( - short protectflag, float axis[3], float *angle, float oldAxis[3], float oldAngle) + short protectflag, float axis[3], float *angle, const float oldAxis[3], float oldAngle) { /* check that protection flags are set */ if ((protectflag & (OB_LOCK_ROTX | OB_LOCK_ROTY | OB_LOCK_ROTZ | OB_LOCK_ROTW)) == 0) { @@ -896,7 +896,7 @@ void headerResize(TransInfo *t, const float vec[3], char str[UI_MAX_DRAW_STR]) * * \note this is a tricky area, before making changes see: T29633, T42444 */ -static void TransMat3ToSize(float mat[3][3], float smat[3][3], float size[3]) +static void TransMat3ToSize(const float mat[3][3], const float smat[3][3], float size[3]) { float rmat[3][3]; diff --git a/source/blender/editors/transform/transform_mode_bbone_resize.c b/source/blender/editors/transform/transform_mode_bbone_resize.c index 2c2253630c0..80a5b307a91 100644 --- a/source/blender/editors/transform/transform_mode_bbone_resize.c +++ b/source/blender/editors/transform/transform_mode_bbone_resize.c @@ -87,7 +87,10 @@ static void headerBoneSize(TransInfo *t, const float vec[3], char str[UI_MAX_DRA } } -static void ElementBoneSize(TransInfo *t, TransDataContainer *tc, TransData *td, float mat[3][3]) +static void ElementBoneSize(TransInfo *t, + TransDataContainer *tc, + TransData *td, + const float mat[3][3]) { float tmat[3][3], smat[3][3], oldy; float sizemat[3][3]; diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c index 8079795d306..50b7c6d147b 100644 --- a/source/blender/editors/transform/transform_snap_object.c +++ b/source/blender/editors/transform/transform_snap_object.c @@ -1302,11 +1302,11 @@ static bool test_projected_edge_dist(const struct DistProjectedAABBPrecalc *prec * \{ */ typedef void (*Nearest2DGetVertCoCallback)(const int index, const float **co, void *data); -typedef void (*Nearest2DGetEdgeVertsCallback)(const int index, int v_index[2], void *data); -typedef void (*Nearest2DGetTriVertsCallback)(const int index, int v_index[3], void *data); +typedef void (*Nearest2DGetEdgeVertsCallback)(const int index, const int v_index[2], void *data); +typedef void (*Nearest2DGetTriVertsCallback)(const int index, const int v_index[3], void *data); /* Equal the previous one */ -typedef void (*Nearest2DGetTriEdgesCallback)(const int index, int e_index[3], void *data); -typedef void (*Nearest2DCopyVertNoCallback)(const int index, float r_no[3], void *data); +typedef void (*Nearest2DGetTriEdgesCallback)(const int index, const int e_index[3], void *data); +typedef void (*Nearest2DCopyVertNoCallback)(const int index, const float r_no[3], void *data); typedef struct Nearest2dUserData { void *userdata; diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.c b/source/blender/editors/uvedit/uvedit_parametrizer.c index a4ee9a294fe..8e079dcac94 100644 --- a/source/blender/editors/uvedit/uvedit_parametrizer.c +++ b/source/blender/editors/uvedit/uvedit_parametrizer.c @@ -497,7 +497,7 @@ static void p_chart_uv_translate(PChart *chart, const float trans[2]) } } -static void p_chart_uv_transform(PChart *chart, float mat[2][2]) +static void p_chart_uv_transform(PChart *chart, const float mat[2][2]) { PVert *v; diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.c b/source/blender/editors/uvedit/uvedit_smart_stitch.c index f649ee528d4..f3ea7456c38 100644 --- a/source/blender/editors/uvedit/uvedit_smart_stitch.c +++ b/source/blender/editors/uvedit/uvedit_smart_stitch.c @@ -323,7 +323,10 @@ static int getNumOfIslandUvs(UvElementMap *elementMap, int island) return elementMap->islandIndices[island + 1] - elementMap->islandIndices[island]; } -static void stitch_uv_rotate(float mat[2][2], float medianPoint[2], float uv[2], float aspect) +static void stitch_uv_rotate(const float mat[2][2], + const float medianPoint[2], + float uv[2], + float aspect) { float uv_rotation_result[2]; diff --git a/source/blender/modifiers/intern/MOD_skin.c b/source/blender/modifiers/intern/MOD_skin.c index 3221acce1ba..1bf07bdefbb 100644 --- a/source/blender/modifiers/intern/MOD_skin.c +++ b/source/blender/modifiers/intern/MOD_skin.c @@ -459,7 +459,7 @@ static void node_frames_init(SkinNode *nf, int totframe) } static void create_frame( - Frame *frame, const float co[3], const float radius[2], float mat[3][3], float offset) + Frame *frame, const float co[3], const float radius[2], const float mat[3][3], float offset) { float rx[3], ry[3], rz[3]; int i; diff --git a/source/blender/modifiers/intern/MOD_uvwarp.c b/source/blender/modifiers/intern/MOD_uvwarp.c index f7d05501b84..adc89f1b954 100644 --- a/source/blender/modifiers/intern/MOD_uvwarp.c +++ b/source/blender/modifiers/intern/MOD_uvwarp.c @@ -49,7 +49,9 @@ #include "MOD_ui_common.h" #include "MOD_util.h" -static void uv_warp_from_mat4_pair(float uv_dst[2], const float uv_src[2], float warp_mat[4][4]) +static void uv_warp_from_mat4_pair(float uv_dst[2], + const float uv_src[2], + const float warp_mat[4][4]) { float tuv[3] = {0.0f}; diff --git a/source/blender/nodes/texture/nodes/node_texture_rotate.c b/source/blender/nodes/texture/nodes/node_texture_rotate.c index 825f9d56147..06eb632378c 100644 --- a/source/blender/nodes/texture/nodes/node_texture_rotate.c +++ b/source/blender/nodes/texture/nodes/node_texture_rotate.c @@ -38,7 +38,7 @@ static bNodeSocketTemplate outputs[] = { {-1, ""}, }; -static void rotate(float new_co[3], float a, float ax[3], const float co[3]) +static void rotate(float new_co[3], float a, const float ax[3], const float co[3]) { float para[3]; float perp[3]; diff --git a/source/blender/simulation/intern/implicit_blender.c b/source/blender/simulation/intern/implicit_blender.c index aef4f404795..ccc26233e3a 100644 --- a/source/blender/simulation/intern/implicit_blender.c +++ b/source/blender/simulation/intern/implicit_blender.c @@ -98,7 +98,7 @@ DO_INLINE void mul_fvector_S(float to[3], const float from[3], float scalar) } /* simple v^T * v product ("outer product") */ /* STATUS: HAS TO BE verified (*should* work) */ -DO_INLINE void mul_fvectorT_fvector(float to[3][3], float vectorA[3], float vectorB[3]) +DO_INLINE void mul_fvectorT_fvector(float to[3][3], const float vectorA[3], const float vectorB[3]) { mul_fvector_S(to[0], vectorB, vectorA[0]); mul_fvector_S(to[1], vectorB, vectorA[1]); @@ -156,7 +156,7 @@ DO_INLINE void cp_lfvector(float (*to)[3], float (*from)[3], unsigned int verts) memcpy(to, from, verts * sizeof(lfVector)); } /* init long vector with float[3] */ -DO_INLINE void init_lfvector(float (*fLongVector)[3], float vector[3], unsigned int verts) +DO_INLINE void init_lfvector(float (*fLongVector)[3], const float vector[3], unsigned int verts) { unsigned int i = 0; for (i = 0; i < verts; i++) { @@ -360,7 +360,7 @@ static void print_bfmatrix(fmatrix3x3 *m) # endif /* copy 3x3 matrix */ -DO_INLINE void cp_fmatrix(float to[3][3], float from[3][3]) +DO_INLINE void cp_fmatrix(float to[3][3], const float from[3][3]) { // memcpy(to, from, sizeof (float) * 9); copy_v3_v3(to[0], from[0]); @@ -429,7 +429,7 @@ DO_INLINE void mul_fmatrix_S(float matrix[3][3], float scalar) /* a vector multiplied by a 3x3 matrix */ /* STATUS: verified */ -DO_INLINE void mul_fvector_fmatrix(float *to, const float *from, float matrix[3][3]) +DO_INLINE void mul_fvector_fmatrix(float *to, const float *from, const float matrix[3][3]) { to[0] = matrix[0][0] * from[0] + matrix[1][0] * from[1] + matrix[2][0] * from[2]; to[1] = matrix[0][1] * from[0] + matrix[1][1] * from[1] + matrix[2][1] * from[2]; @@ -438,14 +438,16 @@ DO_INLINE void mul_fvector_fmatrix(float *to, const float *from, float matrix[3] /* 3x3 matrix multiplied by a vector */ /* STATUS: verified */ -DO_INLINE void mul_fmatrix_fvector(float *to, float matrix[3][3], float from[3]) +DO_INLINE void mul_fmatrix_fvector(float *to, const float matrix[3][3], const float from[3]) { to[0] = dot_v3v3(matrix[0], from); to[1] = dot_v3v3(matrix[1], from); to[2] = dot_v3v3(matrix[2], from); } /* 3x3 matrix addition with 3x3 matrix */ -DO_INLINE void add_fmatrix_fmatrix(float to[3][3], float matrixA[3][3], float matrixB[3][3]) +DO_INLINE void add_fmatrix_fmatrix(float to[3][3], + const float matrixA[3][3], + const float matrixB[3][3]) { add_v3_v3v3(to[0], matrixA[0], matrixB[0]); add_v3_v3v3(to[1], matrixA[1], matrixB[1]); @@ -453,14 +455,16 @@ DO_INLINE void add_fmatrix_fmatrix(float to[3][3], float matrixA[3][3], float ma } /* A -= B*x + C*y (3x3 matrix sub-addition with 3x3 matrix) */ DO_INLINE void subadd_fmatrixS_fmatrixS( - float to[3][3], float matrixA[3][3], float aS, float matrixB[3][3], float bS) + float to[3][3], const float matrixA[3][3], float aS, const float matrixB[3][3], float bS) { VECSUBADDSS(to[0], matrixA[0], aS, matrixB[0], bS); VECSUBADDSS(to[1], matrixA[1], aS, matrixB[1], bS); VECSUBADDSS(to[2], matrixA[2], aS, matrixB[2], bS); } /* A = B - C (3x3 matrix subtraction with 3x3 matrix) */ -DO_INLINE void sub_fmatrix_fmatrix(float to[3][3], float matrixA[3][3], float matrixB[3][3]) +DO_INLINE void sub_fmatrix_fmatrix(float to[3][3], + const float matrixA[3][3], + const float matrixB[3][3]) { sub_v3_v3v3(to[0], matrixA[0], matrixB[0]); sub_v3_v3v3(to[1], matrixA[1], matrixB[1]); @@ -471,14 +475,14 @@ DO_INLINE void sub_fmatrix_fmatrix(float to[3][3], float matrixA[3][3], float ma ///////////////////////////////////////////////////////////////// /* 3x3 matrix multiplied+added by a vector */ /* STATUS: verified */ -DO_INLINE void muladd_fmatrix_fvector(float to[3], float matrix[3][3], float from[3]) +DO_INLINE void muladd_fmatrix_fvector(float to[3], const float matrix[3][3], const float from[3]) { to[0] += dot_v3v3(matrix[0], from); to[1] += dot_v3v3(matrix[1], from); to[2] += dot_v3v3(matrix[2], from); } -DO_INLINE void muladd_fmatrixT_fvector(float to[3], float matrix[3][3], const float from[3]) +DO_INLINE void muladd_fmatrixT_fvector(float to[3], const float matrix[3][3], const float from[3]) { to[0] += matrix[0][0] * from[0] + matrix[1][0] * from[1] + matrix[2][0] * from[2]; to[1] += matrix[0][1] * from[0] + matrix[1][1] * from[1] + matrix[2][1] * from[2]; @@ -492,7 +496,7 @@ BLI_INLINE void outerproduct(float r[3][3], const float a[3], const float b[3]) mul_v3_v3fl(r[2], a, b[2]); } -BLI_INLINE void cross_m3_v3m3(float r[3][3], const float v[3], float m[3][3]) +BLI_INLINE void cross_m3_v3m3(float r[3][3], const float v[3], const float m[3][3]) { cross_v3_v3v3(r[0], v, m[0]); cross_v3_v3v3(r[1], v, m[1]); @@ -512,7 +516,7 @@ BLI_INLINE void cross_v3_identity(float r[3][3], const float v[3]) r[2][2] = 0.0f; } -BLI_INLINE void madd_m3_m3fl(float r[3][3], float m[3][3], float f) +BLI_INLINE void madd_m3_m3fl(float r[3][3], const float m[3][3], float f) { r[0][0] += m[0][0] * f; r[0][1] += m[0][1] * f; @@ -744,7 +748,10 @@ BLI_INLINE void root_to_world_v3(Implicit_Data *data, int index, float r[3], con mul_v3_m3v3(r, data->tfm[index].m, v); } -BLI_INLINE void world_to_root_m3(Implicit_Data *data, int index, float r[3][3], float m[3][3]) +BLI_INLINE void world_to_root_m3(Implicit_Data *data, + int index, + float r[3][3], + const float m[3][3]) { float trot[3][3]; copy_m3_m3(trot, data->tfm[index].m); @@ -752,7 +759,10 @@ BLI_INLINE void world_to_root_m3(Implicit_Data *data, int index, float r[3][3], mul_m3_m3m3(r, trot, m); } -BLI_INLINE void root_to_world_m3(Implicit_Data *data, int index, float r[3][3], float m[3][3]) +BLI_INLINE void root_to_world_m3(Implicit_Data *data, + int index, + float r[3][3], + const float m[3][3]) { mul_m3_m3m3(r, data->tfm[index].m, m); } @@ -1761,8 +1771,12 @@ BLI_INLINE bool spring_length(Implicit_Data *data, return true; } -BLI_INLINE void apply_spring( - Implicit_Data *data, int i, int j, const float f[3], float dfdx[3][3], float dfdv[3][3]) +BLI_INLINE void apply_spring(Implicit_Data *data, + int i, + int j, + const float f[3], + const float dfdx[3][3], + const float dfdv[3][3]) { int block_ij = SIM_mass_spring_add_block(data, i, j); @@ -1899,7 +1913,7 @@ BLI_INLINE void edge_norm(lfVector *data, int i, int j, float r_dir[3]) normalize_v3(r_dir); } -BLI_INLINE float bend_angle(float dir_a[3], float dir_b[3], float dir_e[3]) +BLI_INLINE float bend_angle(const float dir_a[3], const float dir_b[3], const float dir_e[3]) { float cos, sin; float tmp[3]; diff --git a/source/blender/windowmanager/intern/wm_cursors.c b/source/blender/windowmanager/intern/wm_cursors.c index 08d6df340d0..8e89c08a831 100644 --- a/source/blender/windowmanager/intern/wm_cursors.c +++ b/source/blender/windowmanager/intern/wm_cursors.c @@ -121,7 +121,7 @@ static GHOST_TStandardCursor convert_to_ghost_standard_cursor(WMCursorType curs) } static void window_set_custom_cursor( - wmWindow *win, const uchar mask[16][2], uchar bitmap[16][2], int hotx, int hoty) + wmWindow *win, const uchar mask[16][2], const uchar bitmap[16][2], int hotx, int hoty) { GHOST_SetCustomCursorShape( win->ghostwin, (GHOST_TUns8 *)bitmap, (GHOST_TUns8 *)mask, 16, 16, hotx, hoty, true); -- cgit v1.2.3