griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #110694: Edit bones draw as they were in pose mode

Browse Source 
During the refactor 4aef0204ac, assignment of overlay color for edit
mode was removed from get_bone_wire_color.

Pull Request: https://projects.blender.org/blender/blender/pulls/110715
This commit is contained in:
Pratik Borhade
2023-08-03 11:03:39 +02:00
committed by Sybren A. Stüvel
parent 8ea68765fc
commit 1cf4bc2719
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/draw/engines/overlay/overlay_armature.cc
View File

@@ -1157,6 +1157,8 @@ static void get_pchan_color_wire(const ThemeWireColor *bcolor,
{
const bool draw_active = boneflag & BONE_DRAW_ACTIVE;
const bool draw_selected = boneflag & BONE_SELECTED;
const bool is_edit = draw_mode == ARM_DRAW_MODE_EDIT;
float4 wire_color;
if (bcolor) {
if (draw_active && draw_selected) {
@@ -1174,19 +1176,19 @@ static void get_pchan_color_wire(const ThemeWireColor *bcolor,
}
else {
if (draw_active && draw_selected) {
copy_v4_v4(r_color, G_draw.block.color_bone_pose_active);
wire_color = is_edit ? G_draw.block.color_bone_active : G_draw.block.color_bone_pose_active;
}
else if (draw_active) {
copy_v4_v4(r_color, G_draw.block.color_bone_pose_active_unsel);
wire_color = is_edit ? G_draw.block.color_bone_active_unsel :
G_draw.block.color_bone_pose_active_unsel;
}
else if (draw_selected) {
copy_v4_v4(r_color, G_draw.block.color_bone_pose);
wire_color = is_edit ? G_draw.block.color_bone_select : G_draw.block.color_bone_pose;
}
else {
const auto wire_color = (draw_mode == ARM_DRAW_MODE_EDIT) ? G_draw.block.color_wire_edit :
G_draw.block.color_wire;
copy_v4_v4(r_color, wire_color);
wire_color = is_edit ? G_draw.block.color_wire_edit : G_draw.block.color_wire;
}
copy_v4_v4(r_color, wire_color);
}
}