forked from bartvdbraak/blender
Fix T43535 - weight paint issues
Two issues in this report: * Shift-F key conflict between painting and selecting mirrored bone (moved select mirrored to ctrl-shift-F) * It was possible to display texture overlay in weight painting, even though the mode does not support textures yet.
This commit is contained in:
parent
cc388ccca4
commit
6ddd2549ed
@ -366,7 +366,7 @@ void ED_keymap_armature(wmKeyConfig *keyconf)
|
||||
|
||||
WM_keymap_add_item(keymap, "POSE_OT_select_linked", LKEY, KM_PRESS, 0, 0);
|
||||
WM_keymap_add_item(keymap, "POSE_OT_select_grouped", GKEY, KM_PRESS, KM_SHIFT, 0);
|
||||
WM_keymap_add_item(keymap, "POSE_OT_select_mirror", FKEY, KM_PRESS, KM_SHIFT, 0);
|
||||
WM_keymap_add_item(keymap, "POSE_OT_select_mirror", FKEY, KM_PRESS, KM_SHIFT | KM_CTRL, 0);
|
||||
|
||||
WM_keymap_add_item(keymap, "POSE_OT_constraint_add_with_targets", CKEY, KM_PRESS, KM_CTRL | KM_SHIFT, 0);
|
||||
WM_keymap_add_item(keymap, "POSE_OT_constraints_clear", CKEY, KM_PRESS, KM_CTRL | KM_ALT, 0);
|
||||
|
@ -782,7 +782,7 @@ static void paint_draw_alpha_overlay(UnifiedPaintSettings *ups, Brush *brush,
|
||||
paint_draw_cursor_overlay(ups, brush, vc, x, y, zoom);
|
||||
}
|
||||
else {
|
||||
if (!(flags & PAINT_OVERLAY_OVERRIDE_PRIMARY))
|
||||
if (!(flags & PAINT_OVERLAY_OVERRIDE_PRIMARY) && (mode != PAINT_WEIGHT))
|
||||
paint_draw_tex_overlay(ups, brush, vc, x, y, zoom, false, true);
|
||||
if (!(flags & PAINT_OVERLAY_OVERRIDE_CURSOR))
|
||||
paint_draw_cursor_overlay(ups, brush, vc, x, y, zoom);
|
||||
|
Loading…
Reference in New Issue
Block a user