blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Cleanup: remove unused argument

This commit is contained in:
Campbell Barton 2021-01-31 17:15:58 +11:00
parent ae3fee3f47
commit 780857f8e8
Notes: blender-bot 2023-02-14 10:29:32 +01:00 
Referenced by commit a80c0ee167, Revert "Cleanup: remove unused argument"
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source/blender/editors/transform/transform_constraints.c
View File

@ -538,10 +538,7 @@ static void applyObjectConstraintSize(TransInfo *t,
}
}
static void constraints_rotation_imp(TransInfo *t,
float axismtx[3][3],
float r_vec[3],
float *r_angle)
static void constraints_rotation_imp(TransInfo *t, float r_vec[3], float *r_angle)
{
BLI_assert(t->con.mode & CON_APPLY);
int mode = t->con.mode & (CON_AXIS0 | CON_AXIS1 | CON_AXIS2);
@ -585,7 +582,7 @@ static void applyAxisConstraintRot(
TransInfo *t, TransDataContainer *UNUSED(tc), TransData *td, float vec[3], float *angle)
{
if (!td && t->con.mode & CON_APPLY) {
constraints_rotation_imp(t, t->spacemtx, vec, angle);
constraints_rotation_imp(t, vec, angle);
}
}
@ -606,25 +603,13 @@ static void applyObjectConstraintRot(
TransInfo *t, TransDataContainer *tc, TransData *td, float vec[3], float *angle)
{
if (t->con.mode & CON_APPLY) {
float tmp_axismtx[3][3];
float(*axismtx)[3];
/* on setup call, use first object */
if (td == NULL) {
BLI_assert(tc == NULL);
tc = TRANS_DATA_CONTAINER_FIRST_OK(t);
td = tc->data;
}
if (t->flag & T_EDIT) {
mul_m3_m3m3(tmp_axismtx, tc->mat3_unit, td->axismtx);
axismtx = tmp_axismtx;
}
else {
axismtx = td->axismtx;
}
constraints_rotation_imp(t, axismtx, vec, angle);
constraints_rotation_imp(t, vec, angle);
}
}