diff options
author | Campbell Barton <campbell@blender.org> | 2022-05-13 09:14:29 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-05-13 09:14:29 +0300 |
commit | 0d1b9eabf2e5a5ca5947981952f7aa63f55ecea8 (patch) | |
tree | 79a91598abedfbf91a265031445da4eb626e5a1c /source/blender/editors/space_node | |
parent | 3e5cb7b23e11af4122e1bda226179a07f6422902 (diff) | |
parent | 113b8030ced92c23e33717dac97287f8792fd1cb (diff) |
Merge branch 'blender-v3.2-release'
Diffstat (limited to 'source/blender/editors/space_node')
-rw-r--r-- | source/blender/editors/space_node/node_select.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/space_node/node_select.cc b/source/blender/editors/space_node/node_select.cc index 147cbc5a05c..db523651534 100644 --- a/source/blender/editors/space_node/node_select.cc +++ b/source/blender/editors/space_node/node_select.cc @@ -664,7 +664,7 @@ static int node_select_exec(bContext *C, wmOperator *op) RNA_int_get_array(op->ptr, "location", mval); struct SelectPick_Params params = {}; - ED_select_pick_params_from_operator(op, ¶ms); + ED_select_pick_params_from_operator(op->ptr, ¶ms); /* perform the select */ const bool changed = node_mouse_select(C, op, mval, ¶ms); @@ -698,6 +698,7 @@ void NODE_OT_select(wmOperatorType *ot) ot->exec = node_select_exec; ot->invoke = node_select_invoke; ot->poll = ED_operator_node_active; + ot->get_name = ED_select_pick_get_name; /* flags */ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; @@ -887,8 +888,8 @@ void NODE_OT_select_circle(wmOperatorType *ot) ot->invoke = WM_gesture_circle_invoke; ot->exec = node_circleselect_exec; ot->modal = WM_gesture_circle_modal; - ot->poll = ED_operator_node_active; + ot->get_name = ED_select_circle_get_name; /* flags */ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; |