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 <ideasman42@gmail.com>2019-09-14 01:10:50 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-09-14 01:12:53 +0300
commit0547a7753643f45861306542857d97215ecb2c4f (patch)
tree1faad834721f7f13d4a0756bd80607963386fccd /source/blender/editors/transform
parentd30ec73d763ed01795100ec5d3a0ef9dc8521f7b (diff)
Cleanup: use const args, variables
Diffstat (limited to 'source/blender/editors/transform')
-rw-r--r--source/blender/editors/transform/transform.c11
-rw-r--r--source/blender/editors/transform/transform_convert_graph.c4
-rw-r--r--source/blender/editors/transform/transform_convert_mask.c4
-rw-r--r--source/blender/editors/transform/transform_convert_mesh.c4
-rw-r--r--source/blender/editors/transform/transform_convert_tracking.c2
-rw-r--r--source/blender/editors/transform/transform_snap_object.c28
6 files changed, 28 insertions, 25 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 8839abe70a2..a95c7cf7456 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -1794,7 +1794,7 @@ static void drawHelpline(bContext *UNUSED(C), int x, int y, void *customdata)
if (t->helpline != HLP_NONE) {
float cent[2];
- float mval[3] = {
+ const float mval[3] = {
x,
y,
0.0f,
@@ -4322,8 +4322,11 @@ static void headerRotation(TransInfo *t, char str[UI_MAX_DRAW_STR], float final)
*
* Protected axis and other transform settings are taken into account.
*/
-static void ElementRotation_ex(
- TransInfo *t, TransDataContainer *tc, TransData *td, float mat[3][3], const float *center)
+static void ElementRotation_ex(TransInfo *t,
+ TransDataContainer *tc,
+ TransData *td,
+ const float mat[3][3],
+ const float *center)
{
float vec[3], totmat[3][3], smat[3][3];
float eul[3], fmat[3][3], quat[4];
@@ -4727,7 +4730,7 @@ static void initTrackball(TransInfo *t)
static void applyTrackballValue(TransInfo *t,
const float axis1[3],
const float axis2[3],
- float angles[2])
+ const float angles[2])
{
float mat[3][3];
float axis[3];
diff --git a/source/blender/editors/transform/transform_convert_graph.c b/source/blender/editors/transform/transform_convert_graph.c
index c3afbb9b7ba..3eb4d220cb0 100644
--- a/source/blender/editors/transform/transform_convert_graph.c
+++ b/source/blender/editors/transform/transform_convert_graph.c
@@ -63,8 +63,8 @@ static void bezt_to_transdata(TransData *td,
bool selected,
bool ishandle,
bool intvals,
- float mtx[3][3],
- float smtx[3][3],
+ const float mtx[3][3],
+ const float smtx[3][3],
float unit_scale,
float offset)
{
diff --git a/source/blender/editors/transform/transform_convert_mask.c b/source/blender/editors/transform/transform_convert_mask.c
index 9e892f395b3..32152442acf 100644
--- a/source/blender/editors/transform/transform_convert_mask.c
+++ b/source/blender/editors/transform/transform_convert_mask.c
@@ -62,8 +62,8 @@ static void MaskHandleToTransData(MaskSplinePoint *point,
TransData2D *td2d,
TransDataMasking *tdm,
const float asp[2],
- /*const*/ float parent_matrix[3][3],
- /*const*/ float parent_inverse_matrix[3][3])
+ /*const*/ const float parent_matrix[3][3],
+ /*const*/ const float parent_inverse_matrix[3][3])
{
BezTriple *bezt = &point->bezt;
const bool is_sel_any = MASKPOINT_ISSEL_ANY(point);
diff --git a/source/blender/editors/transform/transform_convert_mesh.c b/source/blender/editors/transform/transform_convert_mesh.c
index acbe2c5f06a..9c46094ee83 100644
--- a/source/blender/editors/transform/transform_convert_mesh.c
+++ b/source/blender/editors/transform/transform_convert_mesh.c
@@ -75,7 +75,7 @@ static bool bmesh_test_dist_add(BMVert *v,
/* optionally track original index */
int *index,
const int *index_prev,
- float mtx[3][3])
+ const float mtx[3][3])
{
if ((BM_elem_flag_test(v_other, BM_ELEM_SELECT) == 0) &&
(BM_elem_flag_test(v_other, BM_ELEM_HIDDEN) == 0)) {
@@ -105,7 +105,7 @@ static bool bmesh_test_dist_add(BMVert *v,
* \param index: Optionally store the original index we're measuring the distance to (can be NULL).
*/
static void editmesh_set_connectivity_distance(BMesh *bm,
- float mtx[3][3],
+ const float mtx[3][3],
float *dists,
int *index)
{
diff --git a/source/blender/editors/transform/transform_convert_tracking.c b/source/blender/editors/transform/transform_convert_tracking.c
index d7275f1fbf9..b68b79adbd8 100644
--- a/source/blender/editors/transform/transform_convert_tracking.c
+++ b/source/blender/editors/transform/transform_convert_tracking.c
@@ -76,7 +76,7 @@ static void markerToTransDataInit(TransData *td,
MovieTrackingMarker *marker,
int area,
float loc[2],
- float rel[2],
+ const float rel[2],
const float off[2],
const float aspect[2])
{
diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c
index 76797339cea..9c2642a46c1 100644
--- a/source/blender/editors/transform/transform_snap_object.c
+++ b/source/blender/editors/transform/transform_snap_object.c
@@ -354,7 +354,7 @@ static bool raycastMesh(SnapObjectContext *sctx,
const float ray_dir[3],
Object *ob,
Mesh *me,
- float obmat[4][4],
+ const float obmat[4][4],
const unsigned int ob_index,
bool use_hide,
/* read/write args */
@@ -527,7 +527,7 @@ static bool raycastEditMesh(SnapObjectContext *sctx,
const float ray_dir[3],
Object *ob,
BMEditMesh *em,
- float obmat[4][4],
+ const float obmat[4][4],
const unsigned int ob_index,
/* read/write args */
float *ray_depth,
@@ -710,7 +710,7 @@ static bool raycastObj(SnapObjectContext *sctx,
const float ray_start[3],
const float ray_dir[3],
Object *ob,
- float obmat[4][4],
+ const float obmat[4][4],
const unsigned int ob_index,
bool use_obedit,
bool use_occlusion_test,
@@ -923,10 +923,10 @@ static bool raycastObjects(SnapObjectContext *sctx,
/* Test BoundBox */
static bool snap_bound_box_check_dist(float min[3],
- float max[3],
- float lpmat[4][4],
- float win_size[2],
- float mval[2],
+ const float max[3],
+ const float lpmat[4][4],
+ const float win_size[2],
+ const float mval[2],
float dist_px_sq)
{
/* In vertex and edges you need to get the pixel distance from ray to BoundBox,
@@ -1220,7 +1220,7 @@ static void cb_snap_tri_verts(void *userdata,
static short snap_mesh_polygon(SnapObjectContext *sctx,
SnapData *snapdata,
Object *ob,
- float obmat[4][4],
+ const float obmat[4][4],
/* read/write args */
float *dist_px,
/* return args */
@@ -1362,7 +1362,7 @@ static short snap_mesh_polygon(SnapObjectContext *sctx,
static short snap_mesh_edge_verts_mixed(SnapObjectContext *sctx,
SnapData *snapdata,
Object *ob,
- float obmat[4][4],
+ const float obmat[4][4],
float original_dist_px,
const float prev_co[3],
/* read/write args */
@@ -1542,7 +1542,7 @@ static short snap_mesh_edge_verts_mixed(SnapObjectContext *sctx,
static short snapArmature(SnapData *snapdata,
Object *ob,
- float obmat[4][4],
+ const float obmat[4][4],
bool use_obedit,
/* read/write args */
float *dist_px,
@@ -1687,7 +1687,7 @@ static short snapArmature(SnapData *snapdata,
static short snapCurve(SnapData *snapdata,
Object *ob,
- float obmat[4][4],
+ const float obmat[4][4],
bool use_obedit,
/* read/write args */
float *dist_px,
@@ -1838,7 +1838,7 @@ static short snapCurve(SnapData *snapdata,
/* may extend later (for now just snaps to empty center) */
static short snapEmpty(SnapData *snapdata,
Object *ob,
- float obmat[4][4],
+ const float obmat[4][4],
/* read/write args */
float *dist_px,
/* return args */
@@ -1993,7 +1993,7 @@ static short snapMesh(SnapObjectContext *sctx,
SnapData *snapdata,
Object *ob,
Mesh *me,
- float obmat[4][4],
+ const float obmat[4][4],
/* read/write args */
float *dist_px,
/* return args */
@@ -2231,7 +2231,7 @@ static short snapEditMesh(SnapObjectContext *sctx,
SnapData *snapdata,
Object *ob,
BMEditMesh *em,
- float obmat[4][4],
+ const float obmat[4][4],
/* read/write args */
float *dist_px,
/* return args */