blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 758 Projects 19 Wiki Activity

Fix T76813: Snap to Edge Center returning a different normal from snap to Edge 

This difference was intentional, but using the edge direction as normal is more useful.
This commit is contained in:
Germano Cavalcante 2020-05-18 15:19:13 -03:00
parent 06c57d3e7a
commit afbe71342b
Notes: blender-bot 2023-02-14 00:20:15 +01:00 
Referenced by issue #80183, 'Align Rotation to Target' normal direction broken with 'Edge Center' snapping
Referenced by issue #76813, Edge Center Snapping Does Not Respect 'Align Rotation to Target'
1 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source/blender/editors/transform/transform_snap_object.c
View File

@ -1707,8 +1707,14 @@ static short snap_mesh_edge_verts_mixed(SnapObjectContext *sctx,
&nearest.dist_sq,
nearest.co)) {
nearest.index = vindex[v_id];
nearest2d.copy_vert_no(vindex[v_id], nearest.no, nearest2d.userdata);
elem = SCE_SNAP_MODE_VERTEX;
if (r_no) {
float imat[4][4];
invert_m4_m4(imat, obmat);
nearest2d.copy_vert_no(vindex[v_id], r_no, nearest2d.userdata);
mul_transposed_mat3_m4_v3(imat, r_no);
normalize_v3(r_no);
}
}
}
}
@ -1726,10 +1732,6 @@ static short snap_mesh_edge_verts_mixed(SnapObjectContext *sctx,
vmid,
&nearest.dist_sq,
nearest.co)) {
float v_nor[2][3];
nearest2d.copy_vert_no(vindex[0], v_nor[0], nearest2d.userdata);
nearest2d.copy_vert_no(vindex[1], v_nor[1], nearest2d.userdata);
mid_v3_v3v3(nearest.no, v_nor[0], v_nor[1]);
nearest.index = *r_index;
elem = SCE_SNAP_MODE_EDGE_MIDPOINT;
}
@ -1757,11 +1759,6 @@ static short snap_mesh_edge_verts_mixed(SnapObjectContext *sctx,
v_near,
&nearest.dist_sq,
nearest.co)) {
float v_nor[2][3];
nearest2d.copy_vert_no(vindex[0], v_nor[0], nearest2d.userdata);
nearest2d.copy_vert_no(vindex[1], v_nor[1], nearest2d.userdata);
mid_v3_v3v3(nearest.no, v_nor[0], v_nor[1]);
nearest.index = *r_index;
elem = SCE_SNAP_MODE_EDGE_PERPENDICULAR;
}
@ -1778,15 +1775,6 @@ static short snap_mesh_edge_verts_mixed(SnapObjectContext *sctx,
mul_m4_v3(obmat, r_loc);
}
if (r_no) {
float imat[4][4];
invert_m4_m4(imat, obmat);
copy_v3_v3(r_no, nearest.no);
mul_transposed_mat3_m4_v3(imat, r_no);
normalize_v3(r_no);
}
*r_index = nearest.index;
}