[Bf-blender-cvs] [30f65b54a78] draw-colormanagement: Merge branch 'master' into draw-colormanagement

[Clément Foucault]

Commit: 30f65b54a78edc2a974ba93fefa86534fe2b7ff4
Author: Clément Foucault
Date:   Tue Feb 11 14:57:41 2020 +0100
Branches: draw-colormanagement
https://developer.blender.org/rB30f65b54a78edc2a974ba93fefa86534fe2b7ff4

Merge branch 'master' into draw-colormanagement

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



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

diff --cc source/blender/draw/engines/overlay/overlay_extra.c
index f087b5a70b8,7db55ee9b34..3764994613f
--- a/source/blender/draw/engines/overlay/overlay_extra.c
+++ b/source/blender/draw/engines/overlay/overlay_extra.c
@@@ -867,16 -867,16 +867,16 @@@ static void camera_view3d_reconstructio
    /* Index must start in 1, to mimic BKE_tracking_track_get_indexed. */
    int track_index = 1;
  
 +  float bundle_color_custom[3];
 +  float *bundle_color_solid = G_draw.block.colorBundleSolid;
 +  float *bundle_color_unselected = G_draw.block.colorWire;
    uchar text_color_selected[4], text_color_unselected[4];
 -  float bundle_color_unselected[4], bundle_color_solid[4];
 -
 +  /* Color Management: Exception here as texts are drawn in sRGB space directly.  */
    UI_GetThemeColor4ubv(TH_SELECT, text_color_selected);
    UI_GetThemeColor4ubv(TH_TEXT, text_color_unselected);
 -  UI_GetThemeColor4fv(TH_WIRE, bundle_color_unselected);
 -  UI_GetThemeColor4fv(TH_BUNDLE_SOLID, bundle_color_solid);
  
    float camera_mat[4][4], normal_mat[4][4];
-   BKE_tracking_get_camera_object_matrix(scene, ob, camera_mat);
+   BKE_tracking_get_camera_object_matrix(ob, camera_mat);
  
    normalize_m4_m4(normal_mat, ob->obmat);