diff options
| author | Sybren A. Stüvel <sybren@blender.org> | 2020-11-24 18:05:58 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@blender.org> | 2020-11-24 18:05:58 +0300 |
| commit | 256a9d983d4862560071393f7ddf44bcbd34ad74 (patch) | |
| tree | e59fb5ba5310b9550ce23bb8cdb7865192745a95 | |
| parent | 278011e44d433dc202b2ab8e7907e323fb23c82d (diff) | |
| parent | 31bf8307afc0fb995afcf2233dc50c28b531778d (diff) | |
Merge remote-tracking branch 'origin/blender-v2.91-release'
| -rw-r--r-- | source/blender/blenkernel/intern/lattice_deform.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/animation/anim_channels_edit.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/space_graph/graph_select.c | 9 |
3 files changed, 8 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/lattice_deform.c b/source/blender/blenkernel/intern/lattice_deform.c index 14c600caa46..81c2f492f7e 100644 --- a/source/blender/blenkernel/intern/lattice_deform.c +++ b/source/blender/blenkernel/intern/lattice_deform.c @@ -117,7 +117,7 @@ LatticeDeformData *BKE_lattice_deform_data_create(const Object *oblatt, const Ob int defgrp_index = -1; const MDeformVert *dvert = BKE_lattice_deform_verts_get(oblatt); if (lt->vgroup[0] && dvert) { - defgrp_index = BKE_object_defgroup_name_index(ob, lt->vgroup); + defgrp_index = BKE_object_defgroup_name_index(oblatt, lt->vgroup); if (defgrp_index != -1) { lattice_weights = MEM_malloc_arrayN(sizeof(float), num_points, "lattice_weights"); diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c index 360335a54d7..6c3018749f7 100644 --- a/source/blender/editors/animation/anim_channels_edit.c +++ b/source/blender/editors/animation/anim_channels_edit.c @@ -2683,12 +2683,8 @@ static int animchannels_box_select_exec(bContext *C, wmOperator *op) WM_operator_properties_border_to_rcti(op, &rect); if (!extend) { - printf("\n\n\n\033[92mBox-selecting channels without extend!\033[0m\n"); ANIM_anim_channels_select_set(&ac, ACHANNEL_SETFLAG_CLEAR); } - else { - printf("\n\n\n\033[91mBox-selecting channels WITH extend!\033[0m\n"); - } if (select) { selectmode = ACHANNEL_SETFLAG_ADD; diff --git a/source/blender/editors/space_graph/graph_select.c b/source/blender/editors/space_graph/graph_select.c index ba684972dd7..13f2219d7af 100644 --- a/source/blender/editors/space_graph/graph_select.c +++ b/source/blender/editors/space_graph/graph_select.c @@ -1518,8 +1518,13 @@ static int mouse_graph_keys(bAnimContext *ac, something_was_selected = true; } - if (!run_modal && BEZT_ISSEL_ANY(bezt) && !already_selected) { - BKE_fcurve_active_keyframe_set(nvi->fcu, bezt); + if (!run_modal && BEZT_ISSEL_ANY(bezt)) { + const bool may_activate = !already_selected || + BKE_fcurve_active_keyframe_index(nvi->fcu) == + FCURVE_ACTIVE_KEYFRAME_NONE; + if (may_activate) { + BKE_fcurve_active_keyframe_set(nvi->fcu, bezt); + } } } else if (nvi->fpt) { |