Merge branch 'master' into blender2.8

Conflicts:
	source/blender/editors/space_view3d/drawobject.c

1 files changed, 5 insertions, 5 deletions

diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index c9f697b1cc1..f4498b1592e 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -1907,14 +1907,14 @@ static void drawcamera_volume(float near_plane[4][3], float far_plane[4][3], boo
 		immVertex3fv(pos, near_plane[2]);
 
 		immVertex3fv(pos, near_plane[2]);
-		immVertex3fv(pos, near_plane[1]);
-		immVertex3fv(pos, far_plane[1]);
 		immVertex3fv(pos, far_plane[2]);
-
-		immVertex3fv(pos, far_plane[0]);
-		immVertex3fv(pos, near_plane[0]);
+		immVertex3fv(pos, far_plane[3]);
 		immVertex3fv(pos, near_plane[3]);
+
 		immVertex3fv(pos, far_plane[3]);
+		immVertex3fv(pos, near_plane[3]);
+		immVertex3fv(pos, near_plane[0]);
+		immVertex3fv(pos, far_plane[0]);
 		immEnd();
 #endif
 	}