manual sync with trunk - pulling in changes where the issues are not bmesh spesific

- some merges added lines in multiple times
- removed some NULL checks that were only in bmesh
- enable cycles by default (was disabled because it used not to work)
- make formatting match

1 files changed, 0 insertions, 8 deletions

diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c
index e6c72ce1393..174f8d00c00 100644
--- a/source/blender/editors/transform/transform_orientations.c
+++ b/source/blender/editors/transform/transform_orientations.c
@@ -903,14 +903,6 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3],
 			copy_v3_v3(normal, ob->obmat[2]);
 			copy_v3_v3(plane, ob->obmat[1]);
 		}
-		else {
-			normal[0] = 0.0f;
-			normal[1] = 0.0f;
-			normal[2] = 1.0f;
-			plane[0] = 1.0f;
-			plane[1] = 0.0f;
-			plane[2] = 0.0f;
-		}
 		result = ORIENTATION_NORMAL;
 	}