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

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2018-09-07 11:27:18 +10:00
parent d49cbe1936 7be3378d16
commit 5940ea11ce
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/transform/transform.h
View File

@@ -875,6 +875,8 @@ bool applyTransformOrientation(const struct TransformOrientation *ts, float r_ma
#define ORIENTATION_VERT 2
#define ORIENTATION_EDGE 3
#define ORIENTATION_FACE 4
#define ORIENTATION_USE_PLANE(ty) \
ELEM(ty, ORIENTATION_NORMAL, ORIENTATION_EDGE, ORIENTATION_FACE)
int getTransformOrientation_ex(const struct bContext *C, float normal[3], float plane[3], const short around);
int getTransformOrientation(const struct bContext *C, float normal[3], float plane[3]);

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

@@ -793,12 +793,7 @@ int getTransformOrientation_ex(const bContext *C, float normal[3], float plane[3
}
}
if (is_zero_v3(plane)) {
result = ORIENTATION_VERT;
}
else {
result = ORIENTATION_EDGE;
}
result = ORIENTATION_EDGE;
}
else if (em->bm->totvertsel > 3) {
BMIter iter;
@@ -1101,6 +1096,11 @@ void ED_getTransformOrientationMatrix(const bContext *C, float orientation_mat[3
type = getTransformOrientation_ex(C, normal, plane, around);
/* Fallback, when the plane can't be calculated. */
if (ORIENTATION_USE_PLANE(type) && is_zero_v3(plane)) {
type = ORIENTATION_VERT;
}
switch (type) {
case ORIENTATION_NORMAL:
if (createSpaceNormalTangent(orientation_mat, normal, plane) == 0) {