[Bf-blender-cvs] [c26abd1c29a] master: Fix T66934 Overlay: "Outline Selected" overlay doesnt affect armatures

Clément Foucault noreply at git.blender.org
Tue Jun 23 23:45:49 CEST 2020


Commit: c26abd1c29a25e364fb3f683139364c0d2bb7918
Author: Clément Foucault
Date:   Tue Jun 23 23:45:41 2020 +0200
Branches: master
https://developer.blender.org/rBc26abd1c29a25e364fb3f683139364c0d2bb7918

Fix T66934 Overlay: "Outline Selected" overlay doesnt affect armatures

This is a really small fix. Could be included in 2.83 LTS branch.

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

M	source/blender/draw/engines/overlay/overlay_armature.c

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

diff --git a/source/blender/draw/engines/overlay/overlay_armature.c b/source/blender/draw/engines/overlay/overlay_armature.c
index fa6a51c77bc..7ccb5d5a753 100644
--- a/source/blender/draw/engines/overlay/overlay_armature.c
+++ b/source/blender/draw/engines/overlay/overlay_armature.c
@@ -2168,7 +2168,8 @@ static void armature_context_setup(ArmatureDrawContext *ctx,
   ctx->do_relations = !DRW_state_is_select() && pd->armature.show_relations &&
                       (is_edit_mode | is_pose_mode);
   ctx->const_color = DRW_state_is_select() ? select_const_color : const_color;
-  ctx->const_wire = (((ob->base_flag & BASE_SELECTED) || (arm->drawtype == ARM_WIRE)) ?
+  ctx->const_wire = ((((ob->base_flag & BASE_SELECTED) && (pd->v3d_flag & V3D_SELECT_OUTLINE)) ||
+                      (arm->drawtype == ARM_WIRE)) ?
                          1.5f :
                          ((!is_filled || is_transparent) ? 1.0f : 0.0f));
 }



More information about the Bf-blender-cvs mailing list