archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T80677: Absolute grid snapping doesn't work with constraints

Browse Source 
Regression introduced in rB546b900194f0
This commit is contained in:
Germano Cavalcante
2020-09-11 22:59:21 -03:00
parent a7dc6647ae
commit 4eda60c2d8
4 changed files with 86 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -163,41 +163,6 @@ void constraintNumInput(TransInfo *t, float vec[3])
}
}
static void postConstraintChecks(TransInfo *t, float vec[3])
{
mul_m3_v3(t->spacemtx_inv, vec);
transform_snap_increment(t, vec);
if (t->flag & T_NULL_ONE) {
if (!(t->con.mode & CON_AXIS0)) {
vec[0] = 1.0f;
}
if (!(t->con.mode & CON_AXIS1)) {
vec[1] = 1.0f;
}
if (!(t->con.mode & CON_AXIS2)) {
vec[2] = 1.0f;
}
}
if (applyNumInput(&t->num, vec)) {
constraintNumInput(t, vec);
removeAspectRatio(t, vec);
}
/* If `t->values` is operator param, use that directly but not if snapping is forced */
if (t->flag & T_INPUT_IS_VALUES_FINAL && (t->tsnap.status & SNAP_FORCED) == 0) {
copy_v3_v3(vec, t->values);
constraintValuesFinal(t, vec);
/* inverse transformation at the end */
}
mul_m3_v3(t->spacemtx, vec);
}
static void viewAxisCorrectCenter(const TransInfo *t, float t_con_center[3])
{
if (t->spacetype == SPACE_VIEW3D) {
@@ -432,15 +397,22 @@ static void applyAxisConstraintVec(
{
copy_v3_v3(out, in);
if (!td && t->con.mode & CON_APPLY) {
bool is_snap_to_point = false, is_snap_to_edge = false, is_snap_to_face = false;
mul_m3_v3(t->con.pmtx, out);
bool is_snap_to_edge = false, is_snap_to_face = false;
if (activeSnap(t)) {
is_snap_to_edge = (t->tsnap.snapElem & SCE_SNAP_MODE_EDGE) != 0;
is_snap_to_face = (t->tsnap.snapElem & SCE_SNAP_MODE_FACE) != 0;
if (validSnap(t)) {
is_snap_to_point = (t->tsnap.snapElem & SCE_SNAP_MODE_VERTEX) != 0;
is_snap_to_edge = (t->tsnap.snapElem & SCE_SNAP_MODE_EDGE) != 0;
is_snap_to_face = (t->tsnap.snapElem & SCE_SNAP_MODE_FACE) != 0;
}
else if (t->tsnap.snapElem & SCE_SNAP_MODE_GRID) {
is_snap_to_point = true;
}
}
/* With snap points, a projection is alright, no adjustments needed. */
if (!validSnap(t) || is_snap_to_edge || is_snap_to_face) {
if (!is_snap_to_point || is_snap_to_edge || is_snap_to_face) {
const int dims = getConstraintSpaceDimension(t);
if (dims == 2) {
if (!is_zero_v3(out)) {
@@ -486,7 +458,6 @@ static void applyAxisConstraintVec(
}
}
}
postConstraintChecks(t, out);
}
}