diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-04-10 18:34:31 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-04-10 18:34:31 +0300 |
commit | 45f3150c98443261a1afb6782133053b35a45ce2 (patch) | |
tree | 5f3234fbbb49db56eca342a515ec046302e8f733 /source | |
parent | 5f7011603077511425febf2a7397b2cc7bba1720 (diff) | |
parent | 2ad112437269989439361c23fc9295d642ec11d3 (diff) |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/space_view3d/drawobject.c
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 10 |
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 } |