Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 2 May 2018 10:46:14 +0000 (12:46 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 2 May 2018 10:46:14 +0000 (12:46 +0200)
1  2 
intern/cycles/device/device_cuda.cpp
source/blender/blenlib/intern/math_color.c
source/blender/editors/interface/interface_draw.c
source/blender/editors/space_image/image_draw.c

Simple merge
index 97491d365b7002627cfd0d2e249731a4be5a1520,7583dc654bbe17db32961645798580f120ed99aa..11cbc4487133dbb897f27972e4d087da7b7ffaff
@@@ -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;