[Bf-blender-cvs] [644cd00d1a6] soc-2018-npr: Merge branch 'blender2.8' of git://git.blender.org/blender

[Nick Wu]

Commit: 644cd00d1a647eb1e55263722997544a1a2cc91e
Author: Nick Wu
Date:   Mon Apr 30 08:58:47 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB644cd00d1a647eb1e55263722997544a1a2cc91e

Merge branch 'blender2.8' of git://git.blender.org/blender

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



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

diff --cc source/blender/editors/interface/interface_draw.c
index 7583dc654bb,97491d365b7..11cbc448713
--- a/source/blender/editors/interface/interface_draw.c
+++ b/source/blender/editors/interface/interface_draw.c
@@@ -825,13 -1108,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;