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

[Campbell Barton]

Commit: d09920687c4474f5f6ccf0f089d359f69932afac
Author: Campbell Barton
Date:   Wed May 2 12:46:14 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBd09920687c4474f5f6ccf0f089d359f69932afac

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/editors/interface/interface_draw.c
index 97491d365b7,7583dc654bb..11cbc448713
--- a/source/blender/editors/interface/interface_draw.c
+++ b/source/blender/editors/interface/interface_draw.c
@@@ -1108,13 -825,13 +1108,13 @@@ static float polar_to_y(float center, f
  	return center + diam * ampli * sinf(angle);
  }
  
 -static void vectorscope_draw_target(float centerx, float centery, float diam, const float colf[3])
 +static void vectorscope_draw_target(unsigned int pos, float centerx, float centery, float diam, const float colf[3])
  {
  	float y, u, v;
 -	float tangle = 0.f, tampli;
 +	float tangle = 0.0f, tampli;
  	float dangle, dampli, dangle2, dampli2;
  
- 	rgb_to_yuv(colf[0], colf[1], colf[2], &y, &u, &v);
+ 	rgb_to_yuv(colf[0], colf[1], colf[2], &y, &u, &v, BLI_YUV_ITU_BT709);
  	if (u > 0 && v >= 0) tangle = atanf(v / u);
  	else if (u > 0 && v < 0) tangle = atanf(v / u) + 2.0f * (float)M_PI;
  	else if (u < 0) tangle = atanf(v / u) + (float)M_PI;