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

[Clément Foucault]

Commit: c7b319279e4e1d5d3a73061fd96c546984f8383e
Author: Clément Foucault
Date:   Fri Feb 7 02:05:45 2020 +0100
Branches: draw-colormanagement
https://developer.blender.org/rBc7b319279e4e1d5d3a73061fd96c546984f8383e

Merge branch 'master' into draw-colormanagement

# Conflicts:
#	source/blender/draw/engines/overlay/overlay_armature.c

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



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

diff --cc source/blender/draw/engines/overlay/overlay_armature.c
index 9174d50009f,4571446763c..c80cda26fa2
--- a/source/blender/draw/engines/overlay/overlay_armature.c
+++ b/source/blender/draw/engines/overlay/overlay_armature.c
@@@ -2128,7 -2288,29 +2149,7 @@@ static void armature_context_setup(Arma
    ctx->const_color = DRW_state_is_select() ? select_const_color : const_color;
    ctx->const_wire = (((ob->base_flag & BASE_SELECTED) || (arm->drawtype == ARM_WIRE)) ?
                           1.5f :
-                          ((ctx->transparent) ? 1.0f : 0.0f));
+                          ((!is_filled || is_transparent) ? 1.0f : 0.0f));
 -
 -  /** See: 'set_pchan_color'*/
 -#define NO_ALPHA(c) (((c)[3] = 1.0f), (c))
 -
 -  UI_GetThemeColor3fv(TH_SELECT, NO_ALPHA(ctx->color.select));
 -  UI_GetThemeColorShade3fv(TH_EDGE_SELECT, 60, NO_ALPHA(ctx->color.edge_select));
 -  UI_GetThemeColorShade3fv(TH_EDGE_SELECT, -20, NO_ALPHA(ctx->color.bone_select));
 -  UI_GetThemeColor3fv(TH_WIRE, NO_ALPHA(ctx->color.wire));
 -  UI_GetThemeColor3fv(TH_WIRE_EDIT, NO_ALPHA(ctx->color.wire_edit));
 -  UI_GetThemeColor3fv(TH_BONE_SOLID, NO_ALPHA(ctx->color.bone_solid));
 -  UI_GetThemeColorBlendShade3fv(
 -      TH_WIRE_EDIT, TH_EDGE_SELECT, 0.15f, 0, NO_ALPHA(ctx->color.bone_active_unselect));
 -  UI_GetThemeColor3fv(TH_BONE_POSE, NO_ALPHA(ctx->color.bone_pose));
 -  UI_GetThemeColor3fv(TH_BONE_POSE_ACTIVE, NO_ALPHA(ctx->color.bone_pose_active));
 -  UI_GetThemeColorBlendShade3fv(
 -      TH_WIRE, TH_BONE_POSE, 0.15f, 0, NO_ALPHA(ctx->color.bone_pose_active_unselect));
 -  UI_GetThemeColor3fv(TH_TEXT_HI, NO_ALPHA(ctx->color.text_hi));
 -  UI_GetThemeColor3fv(TH_TEXT, NO_ALPHA(ctx->color.text));
 -  UI_GetThemeColor3fv(TH_VERTEX_SELECT, NO_ALPHA(ctx->color.vertex_select));
 -  UI_GetThemeColor3fv(TH_VERTEX, NO_ALPHA(ctx->color.vertex));
 -
 -#undef NO_ALPHA
  }
  
  void OVERLAY_edit_armature_cache_populate(OVERLAY_Data *vedata, Object *ob)