diff options
| author | Sergey Sharybin <sergey@blender.org> | 2022-05-17 12:31:59 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey@blender.org> | 2022-05-17 12:31:59 +0300 |
| commit | f9ed31b15d7aa1cbbaa54e675fd98cbfeecd1de7 (patch) | |
| tree | c861986fced209ad909b425b2c0b9d226931f49e | |
| parent | f752eaadbdb147f072b9a62b88898c4adb290970 (diff) | |
| parent | 4301b6c8966d61c794a0fc92b90c114257313481 (diff) | |
Merge branch 'blender-v3.2-release'
4 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/mask/mask_select.c b/source/blender/editors/mask/mask_select.c index 1c84cffbcad..7c0b6fb0a93 100644 --- a/source/blender/editors/mask/mask_select.c +++ b/source/blender/editors/mask/mask_select.c @@ -749,7 +749,7 @@ void MASK_OT_select_circle(wmOperatorType *ot) ot->modal = WM_gesture_circle_modal; ot->exec = circle_select_exec; ot->poll = ED_maskedit_mask_poll; - ot->get_name = ED_select_pick_get_name; + ot->get_name = ED_select_circle_get_name; /* flags */ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; diff --git a/source/blender/editors/space_action/action_select.c b/source/blender/editors/space_action/action_select.c index 303d9fe177b..aff888818e0 100644 --- a/source/blender/editors/space_action/action_select.c +++ b/source/blender/editors/space_action/action_select.c @@ -887,7 +887,7 @@ void ACTION_OT_select_circle(wmOperatorType *ot) ot->exec = action_circle_select_exec; ot->poll = ED_operator_action_active; ot->cancel = WM_gesture_circle_cancel; - ot->get_name = ED_select_pick_get_name; + ot->get_name = ED_select_circle_get_name; /* flags */ ot->flag = OPTYPE_UNDO; diff --git a/source/blender/editors/space_clip/tracking_select.c b/source/blender/editors/space_clip/tracking_select.c index be6f4558066..bbfbbd2cc58 100644 --- a/source/blender/editors/space_clip/tracking_select.c +++ b/source/blender/editors/space_clip/tracking_select.c @@ -830,7 +830,7 @@ void CLIP_OT_select_circle(wmOperatorType *ot) ot->modal = WM_gesture_circle_modal; ot->exec = circle_select_exec; ot->poll = ED_space_clip_tracking_poll; - ot->get_name = ED_select_pick_get_name; + ot->get_name = ED_select_circle_get_name; /* flags */ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; diff --git a/source/blender/editors/space_graph/graph_select.c b/source/blender/editors/space_graph/graph_select.c index b8295150478..e71c5114b0a 100644 --- a/source/blender/editors/space_graph/graph_select.c +++ b/source/blender/editors/space_graph/graph_select.c @@ -1080,7 +1080,7 @@ void GRAPH_OT_select_circle(wmOperatorType *ot) ot->exec = graph_circle_select_exec; ot->poll = graphop_visible_keyframes_poll; ot->cancel = WM_gesture_circle_cancel; - ot->get_name = ED_select_pick_get_name; + ot->get_name = ED_select_circle_get_name; /* flags */ ot->flag = OPTYPE_UNDO; |