diff options
Diffstat (limited to 'source/blender/editors/uvedit/uvedit_ops.c')
-rw-r--r-- | source/blender/editors/uvedit/uvedit_ops.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index a17d3c20c1c..fbb6250c05b 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -113,7 +113,7 @@ static int ED_operator_uvedit_can_uv_sculpt(struct bContext *C) return ED_space_image_show_uvedit(sima, obedit) && !(toolsettings->use_uv_sculpt); } -static int UNUSED_FUNCTION(ED_operator_uvmap_mesh) (bContext * C) +static int UNUSED_FUNCTION(ED_operator_uvmap_mesh) (bContext *C) { Object *ob = CTX_data_active_object(C); @@ -1582,7 +1582,7 @@ static void UV_OT_align(wmOperatorType *ot) /* api callbacks */ ot->exec = align_exec; - ot->poll = ED_operator_image_active; /* requires space image */; + ot->poll = ED_operator_uvedit; /* requires space image */; /* properties */ RNA_def_enum(ot->srna, "axis", axis_items, 'a', "Axis", "Axis to align UV locations on"); @@ -2258,7 +2258,7 @@ static void UV_OT_select(wmOperatorType *ot) /* api callbacks */ ot->exec = select_exec; ot->invoke = select_invoke; - ot->poll = ED_operator_image_active; /* requires space image */; + ot->poll = ED_operator_uvedit; /* requires space image */; /* properties */ RNA_def_boolean(ot->srna, "extend", 0, @@ -2303,7 +2303,7 @@ static void UV_OT_select_loop(wmOperatorType *ot) /* api callbacks */ ot->exec = select_loop_exec; ot->invoke = select_loop_invoke; - ot->poll = ED_operator_image_active; /* requires space image */; + ot->poll = ED_operator_uvedit; /* requires space image */; /* properties */ RNA_def_boolean(ot->srna, "extend", 0, @@ -2377,7 +2377,7 @@ static void UV_OT_select_linked(wmOperatorType *ot) /* api callbacks */ ot->exec = select_linked_exec; - ot->poll = ED_operator_image_active; /* requires space image */ + ot->poll = ED_operator_uvedit; /* requires space image */ /* properties */ RNA_def_boolean(ot->srna, "extend", 0, @@ -2405,7 +2405,7 @@ static void UV_OT_select_linked_pick(wmOperatorType *ot) /* api callbacks */ ot->invoke = select_linked_pick_invoke; ot->exec = select_linked_pick_exec; - ot->poll = ED_operator_image_active; /* requires space image */; + ot->poll = ED_operator_uvedit; /* requires space image */; /* properties */ RNA_def_boolean(ot->srna, "extend", 0, @@ -2842,7 +2842,7 @@ static void UV_OT_select_border(wmOperatorType *ot) ot->invoke = WM_border_select_invoke; ot->exec = border_select_exec; ot->modal = WM_border_select_modal; - ot->poll = ED_operator_image_active; /* requires space image */; + ot->poll = ED_operator_uvedit; /* requires space image */; ot->cancel = WM_border_select_cancel; /* flags */ @@ -2966,7 +2966,7 @@ static void UV_OT_circle_select(wmOperatorType *ot) ot->invoke = WM_gesture_circle_invoke; ot->modal = WM_gesture_circle_modal; ot->exec = circle_select_exec; - ot->poll = ED_operator_image_active; /* requires space image */; + ot->poll = ED_operator_uvedit; /* requires space image */; ot->cancel = WM_gesture_circle_cancel; /* flags */ @@ -3095,7 +3095,7 @@ static void UV_OT_select_lasso(wmOperatorType *ot) ot->invoke = WM_gesture_lasso_invoke; ot->modal = WM_gesture_lasso_modal; ot->exec = uv_lasso_select_exec; - ot->poll = ED_operator_image_active; + ot->poll = ED_operator_uvedit; ot->cancel = WM_gesture_lasso_cancel; /* flags */ @@ -3170,7 +3170,7 @@ static void UV_OT_snap_cursor(wmOperatorType *ot) /* api callbacks */ ot->exec = snap_cursor_exec; - ot->poll = ED_operator_image_active; /* requires space image */; + ot->poll = ED_operator_uvedit; /* requires space image */; /* properties */ RNA_def_enum(ot->srna, "target", target_items, 0, "Target", "Target to snap the selected UVs to"); @@ -3350,7 +3350,7 @@ static void UV_OT_snap_selected(wmOperatorType *ot) /* api callbacks */ ot->exec = snap_selection_exec; - ot->poll = ED_operator_image_active; /* requires space image */; + ot->poll = ED_operator_uvedit; /* requires space image */; /* properties */ RNA_def_enum(ot->srna, "target", target_items, 0, "Target", "Target to snap the selected UVs to"); @@ -3769,7 +3769,7 @@ static void UV_OT_cursor_set(wmOperatorType *ot) /* api callbacks */ ot->exec = set_2d_cursor_exec; ot->invoke = set_2d_cursor_invoke; - ot->poll = ED_operator_image_active; /* requires space image */; + ot->poll = ED_operator_uvedit; /* requires space image */; /* flags */ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; |