[Bf-blender-cvs] [780857f8e81] master: Cleanup: remove unused argument
Campbell Barton
noreply at git.blender.org
Sun Jan 31 07:16:34 CET 2021
Commit: 780857f8e8139613711cba041f5f0af9799804ec
Author: Campbell Barton
Date: Sun Jan 31 17:15:58 2021 +1100
Branches: master
https://developer.blender.org/rB780857f8e8139613711cba041f5f0af9799804ec
Cleanup: remove unused argument
===================================================================
M source/blender/editors/transform/transform_constraints.c
===================================================================
diff --git a/source/blender/editors/transform/transform_constraints.c b/source/blender/editors/transform/transform_constraints.c
index 50f9788cea5..8c45dfc1965 100644
--- a/source/blender/editors/transform/transform_constraints.c
+++ b/source/blender/editors/transform/transform_constraints.c
@@ -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);
}
}
More information about the Bf-blender-cvs
mailing list