Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 11 Sep 2018 05:01:41 +0000 (15:01 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 11 Sep 2018 05:01:41 +0000 (15:01 +1000)
source/blender/editors/transform/transform_orientations.c

index 2dcd11d89ffb08e33665bf4c3cc5f7a16da172fc..2962c88c3520cb6aa5989f822545cd271c603ee6 100644 (file)
@@ -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;