[Bf-blender-cvs] [45f3150c984] blender2.8: Merge branch 'master' into blender2.8

[Bastien Montagne]

Commit: 45f3150c98443261a1afb6782133053b35a45ce2
Author: Bastien Montagne
Date:   Mon Apr 10 17:34:31 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB45f3150c98443261a1afb6782133053b35a45ce2

Merge branch 'master' into blender2.8

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

===================================================================



===================================================================

diff --cc source/blender/editors/space_view3d/drawobject.c
index c9f697b1cc1,3226601be46..f4498b1592e
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@@ -1874,58 -1849,16 +1874,58 @@@ static void drawcamera_frame(float vec[
  }
  
  /* center point to camera frame */
 -static void drawcamera_framelines(float vec[4][3], float origin[3])
 -{
 -	glBegin(GL_LINE_STRIP);
 -	glVertex3fv(vec[1]);
 -	glVertex3fv(origin);
 -	glVertex3fv(vec[0]);
 -	glVertex3fv(vec[3]);
 -	glVertex3fv(origin);
 -	glVertex3fv(vec[2]);
 -	glEnd();
 +static void drawcamera_framelines(float vec[4][3], float origin[3], unsigned pos)
 +{
 +	immBegin(PRIM_LINES, 8);
 +	immVertex3fv(pos, origin);
 +	immVertex3fv(pos, vec[0]);
 +	immVertex3fv(pos, origin);
 +	immVertex3fv(pos, vec[1]);
 +	immVertex3fv(pos, origin);
 +	immVertex3fv(pos, vec[2]);
 +	immVertex3fv(pos, origin);
 +	immVertex3fv(pos, vec[3]);
 +	immEnd();
 +}
 +
 +static void drawcamera_volume(float near_plane[4][3], float far_plane[4][3], bool filled, unsigned pos)
 +{
 +	drawcamera_frame(near_plane, filled, pos);
 +	drawcamera_frame(far_plane, filled, pos);
 +
 +	if (filled) {
 +#ifdef WITH_GL_PROFILE_COMPAT
 +		immBegin(PRIM_QUADS_XXX, 16); /* TODO(merwin): use PRIM_TRIANGLE_STRIP here */
 +		immVertex3fv(pos, near_plane[0]);
 +		immVertex3fv(pos, far_plane[0]);
 +		immVertex3fv(pos, far_plane[1]);
 +		immVertex3fv(pos, near_plane[1]);
 +
 +		immVertex3fv(pos, near_plane[1]);
 +		immVertex3fv(pos, far_plane[1]);
 +		immVertex3fv(pos, far_plane[2]);
 +		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
 +	}
 +	else {
 +		immBegin(PRIM_LINES, 8);
 +		for (int i = 0; i < 4; ++i) {
 +			immVertex3fv(pos, near_plane[i]);
 +			immVertex3fv(pos, far_plane[i]);
 +		}
 +		immEnd();
 +	}
  }
  
  static bool drawcamera_is_stereo3d(Scene *scene, View3D *v3d, Object *ob)