Index: source/blender/editors/sculpt_paint/paint_image.c |
=================================================================== |
--- source/blender/editors/sculpt_paint/paint_image.c (revision 35974) |
+++ source/blender/editors/sculpt_paint/paint_image.c (working copy) |
@@ -5065,56 +5065,6 @@ |
} |
} |
-/* ************ image paint radial control *************/ |
-static int paint_radial_control_invoke(bContext *C, wmOperator *op, wmEvent *event) |
-{ |
- float zoom; |
- ToolSettings *ts = CTX_data_scene(C)->toolsettings; |
- get_imapaint_zoom(C, &zoom, &zoom); |
- toggle_paint_cursor(C, 0); |
- brush_radial_control_invoke(op, paint_brush(&ts->imapaint.paint), zoom); |
- return WM_radial_control_invoke(C, op, event); |
-} |
- |
-static int paint_radial_control_modal(bContext *C, wmOperator *op, wmEvent *event) |
-{ |
- int ret = WM_radial_control_modal(C, op, event); |
- if(ret != OPERATOR_RUNNING_MODAL) |
- toggle_paint_cursor(C, 1); |
- return ret; |
-} |
- |
-static int paint_radial_control_exec(bContext *C, wmOperator *op) |
-{ |
- Brush *brush = paint_brush(&CTX_data_scene(C)->toolsettings->imapaint.paint); |
- float zoom; |
- int ret; |
- char str[64]; |
- get_imapaint_zoom(C, &zoom, &zoom); |
- ret = brush_radial_control_exec(op, brush, 1.0f / zoom); |
- WM_radial_control_string(op, str, sizeof(str)); |
- |
- WM_event_add_notifier(C, NC_BRUSH|NA_EDITED, brush); |
- |
- return ret; |
-} |
- |
-void PAINT_OT_image_paint_radial_control(wmOperatorType *ot) |
-{ |
- WM_OT_radial_control_partial(ot); |
- |
- ot->name= "Image Paint Radial Control"; |
- ot->idname= "PAINT_OT_image_paint_radial_control"; |
- |
- ot->invoke= paint_radial_control_invoke; |
- ot->modal= paint_radial_control_modal; |
- ot->exec= paint_radial_control_exec; |
- ot->poll= image_paint_poll; |
- |
- /* flags */ |
- ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; |
-} |
- |
/************************ grab clone operator ************************/ |
typedef struct GrabClone { |
@@ -5422,28 +5372,6 @@ |
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; |
} |
-/************* texture paint radial control *************/ |
- |
-static int texture_paint_radial_control_invoke(bContext *C, wmOperator *op, wmEvent *event) |
-{ |
- ToolSettings *ts = CTX_data_scene(C)->toolsettings; |
- toggle_paint_cursor(C, !ts->imapaint.paintcursor); |
- brush_radial_control_invoke(op, paint_brush(&ts->imapaint.paint), 1); |
- return WM_radial_control_invoke(C, op, event); |
-} |
- |
-static int texture_paint_radial_control_exec(bContext *C, wmOperator *op) |
-{ |
- Brush *brush = paint_brush(&CTX_data_scene(C)->toolsettings->imapaint.paint); |
- int ret = brush_radial_control_exec(op, brush, 1); |
- char str[64]; |
- WM_radial_control_string(op, str, sizeof(str)); |
- |
- WM_event_add_notifier(C, NC_BRUSH|NA_EDITED, brush); |
- |
- return ret; |
-} |
- |
static int texture_paint_poll(bContext *C) |
{ |
if(texture_paint_toggle_poll(C)) |
@@ -5458,23 +5386,6 @@ |
return (texture_paint_poll(C) || image_paint_poll(C)); |
} |
-void PAINT_OT_texture_paint_radial_control(wmOperatorType *ot) |
-{ |
- WM_OT_radial_control_partial(ot); |
- |
- ot->name= "Texture Paint Radial Control"; |
- ot->idname= "PAINT_OT_texture_paint_radial_control"; |
- |
- ot->invoke= texture_paint_radial_control_invoke; |
- ot->modal= paint_radial_control_modal; |
- ot->exec= texture_paint_radial_control_exec; |
- ot->poll= texture_paint_poll; |
- |
- /* flags */ |
- ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; |
-} |
- |
- |
int facemask_paint_poll(bContext *C) |
{ |
return paint_facesel_test(CTX_data_active_object(C)); |