Merge branch 'master' into blender2.8

2018-09-11 15:01:41 +10:00
parent c317a21a4c 6bf003bce0
commit bdf215ca82
1 changed files with 1 additions and 1 deletions
--- a/source/blender/editors/transform/transform_orientations.c
+++ b/source/blender/editors/transform/transform_orientations.c
@@ -793,7 +793,7 @@ int getTransformOrientation_ex(const bContext *C, float normal[3], float plane[3
 						}
 					}

-					result = ORIENTATION_EDGE;
+					result = is_zero_v3(plane) ? ORIENTATION_VERT : ORIENTATION_EDGE;
 				}
 				else if (em->bm->totvertsel > 3) {
 					BMIter iter;