Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <campbell@blender.org>2022-05-13 09:14:29 +0300
committerCampbell Barton <campbell@blender.org>2022-05-13 09:14:29 +0300
commit0d1b9eabf2e5a5ca5947981952f7aa63f55ecea8 (patch)
tree79a91598abedfbf91a265031445da4eb626e5a1c /source/blender/editors/uvedit
parent3e5cb7b23e11af4122e1bda226179a07f6422902 (diff)
parent113b8030ced92c23e33717dac97287f8792fd1cb (diff)
Merge branch 'blender-v3.2-release'
Diffstat (limited to 'source/blender/editors/uvedit')
-rw-r--r--source/blender/editors/uvedit/uvedit_select.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/uvedit/uvedit_select.c b/source/blender/editors/uvedit/uvedit_select.c
index 13dac431b57..b1f2289ee22 100644
--- a/source/blender/editors/uvedit/uvedit_select.c
+++ b/source/blender/editors/uvedit/uvedit_select.c
@@ -2645,7 +2645,7 @@ static int uv_select_exec(bContext *C, wmOperator *op)
RNA_float_get_array(op->ptr, "location", co);
struct SelectPick_Params params = {0};
- ED_select_pick_params_from_operator(op, &params);
+ ED_select_pick_params_from_operator(op->ptr, &params);
const bool changed = uv_mouse_select(C, co, &params);
@@ -2680,6 +2680,7 @@ void UV_OT_select(wmOperatorType *ot)
ot->exec = uv_select_exec;
ot->invoke = uv_select_invoke;
ot->poll = ED_operator_uvedit; /* requires space image */
+ ot->get_name = ED_select_pick_get_name;
/* properties */
PropertyRNA *prop;
@@ -3849,6 +3850,7 @@ void UV_OT_select_circle(wmOperatorType *ot)
ot->exec = uv_circle_select_exec;
ot->poll = ED_operator_uvedit_space_image; /* requires space image */
ot->cancel = WM_gesture_circle_cancel;
+ ot->get_name = ED_select_circle_get_name;
/* flags */
ot->flag = OPTYPE_UNDO;