blender
/
blender
134
399
Fork 581
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

Fix T53311: transform edge/normal orientation 

When the edge is aligned with it's own normals,
transform orientation wasn't aligned with the edge.
This commit is contained in:
Campbell Barton 2018-01-11 19:09:45 +11:00
parent 38357cd004
commit 57b11d8b4e
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/editors/transform/transform_orientations.c
View File

@ -743,10 +743,19 @@ int getTransformOrientation_ex(const bContext *C, float normal[3], float plane[3
SWAP(BMVert *, v_pair[0], v_pair[1]);
}
add_v3_v3v3(normal, v_pair[0]->no, v_pair[1]->no);
sub_v3_v3v3(plane, v_pair[0]->co, v_pair[1]->co);
/* flip the plane normal so we point outwards */
negate_v3(plane);
add_v3_v3v3(normal, v_pair[1]->no, v_pair[0]->no);
sub_v3_v3v3(plane, v_pair[1]->co, v_pair[0]->co);
if (normalize_v3(plane) != 0.0f) {
/* For edges it'd important the resulting matrix can rotate around the edge,
* project onto the plane so we can use a fallback value. */
project_plane_normalized_v3_v3v3(normal, normal, plane);
if (UNLIKELY(normalize_v3(normal) == 0.0f)) {
/* in the case the normal and plane are aligned,
* use a fallback normal which is orthogonal to the plane. */
ortho_v3_v3(normal, plane);
}
}
}
result = ORIENTATION_EDGE;