svn merge -r36603:36628 https://svn.blender.org/svnroot/bf-blender/trunk/blender

[blender.git] / source / blender / editors / sculpt_paint / paint_vertex.c

diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c
index 4f77ecf828742bdd2831fcfb30763276ddf7a8c4..cc3ee805a8b938db3b46cfbedece7a966cf1d2c8 100644 (file)
--- a/source/blender/editors/sculpt_paint/paint_vertex.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex.c
@@ -1205,110 +1205,6 @@ void PAINT_OT_weight_paint_toggle(wmOperatorType *ot)
        
 }
 
        
 }
 

-/* ************ paint radial controls *************/
-
-static int vpaint_radial_control_invoke(bContext *C, wmOperator *op, wmEvent *event)
-{
-       Paint *p = paint_get_active(CTX_data_scene(C));
-       Brush *brush = paint_brush(p);
-       float col[4];
-       
-       WM_paint_cursor_end(CTX_wm_manager(C), p->paint_cursor);
-       p->paint_cursor = NULL;
-       brush_radial_control_invoke(op, brush, 1);
-
-       copy_v3_v3(col, brush->add_col);
-       col[3]= 0.5f;
-       RNA_float_set_array(op->ptr, "color", col);
-
-       return WM_radial_control_invoke(C, op, event);
-}
-
-static int vpaint_radial_control_modal(bContext *C, wmOperator *op, wmEvent *event)
-{
-       int ret = WM_radial_control_modal(C, op, event);
-       if(ret != OPERATOR_RUNNING_MODAL)
-               paint_cursor_start(C, vertex_paint_poll);
-       return ret;
-}
-
-static int vpaint_radial_control_exec(bContext *C, wmOperator *op)
-{
-       Brush *brush = paint_brush(&CTX_data_scene(C)->toolsettings->vpaint->paint);
-       int ret = brush_radial_control_exec(op, brush, 1);
-       
-       WM_event_add_notifier(C, NC_BRUSH|NA_EDITED, brush);
-       
-       return ret;
-}
-
-static int wpaint_radial_control_invoke(bContext *C, wmOperator *op, wmEvent *event)
-{
-       Paint *p = paint_get_active(CTX_data_scene(C));
-       Brush *brush = paint_brush(p);
-       float col[4];
-       
-       WM_paint_cursor_end(CTX_wm_manager(C), p->paint_cursor);
-       p->paint_cursor = NULL;
-       brush_radial_control_invoke(op, brush, 1);
-
-       copy_v3_v3(col, brush->add_col);
-       col[3]= 0.5f;
-       RNA_float_set_array(op->ptr, "color", col);
-
-       return WM_radial_control_invoke(C, op, event);
-}
-
-static int wpaint_radial_control_modal(bContext *C, wmOperator *op, wmEvent *event)
-{
-       int ret = WM_radial_control_modal(C, op, event);
-       if(ret != OPERATOR_RUNNING_MODAL)
-               paint_cursor_start(C, weight_paint_poll);
-       return ret;
-}
-
-static int wpaint_radial_control_exec(bContext *C, wmOperator *op)
-{
-       Brush *brush = paint_brush(&CTX_data_scene(C)->toolsettings->wpaint->paint);
-       int ret = brush_radial_control_exec(op, brush, 1);
-       
-       WM_event_add_notifier(C, NC_BRUSH|NA_EDITED, brush);
-       
-       return ret;
-}
-
-void PAINT_OT_weight_paint_radial_control(wmOperatorType *ot)
-{
-       WM_OT_radial_control_partial(ot);
-
-       ot->name= "Weight Paint Radial Control";
-       ot->idname= "PAINT_OT_weight_paint_radial_control";
-
-       ot->invoke= wpaint_radial_control_invoke;
-       ot->modal= wpaint_radial_control_modal;
-       ot->exec= wpaint_radial_control_exec;
-       ot->poll= weight_paint_poll;
-       
-       /* flags */
-       ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
-}
-
-void PAINT_OT_vertex_paint_radial_control(wmOperatorType *ot)
-{
-       WM_OT_radial_control_partial(ot);
-
-       ot->name= "Vertex Paint Radial Control";
-       ot->idname= "PAINT_OT_vertex_paint_radial_control";
-
-       ot->invoke= vpaint_radial_control_invoke;
-       ot->modal= vpaint_radial_control_modal;
-       ot->exec= vpaint_radial_control_exec;
-       ot->poll= vertex_paint_poll;
-       
-       /* flags */
-       ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
-}
-

 /* ************ weight paint operator ********** */
 
 struct WPaintData {
 /* ************ weight paint operator ********** */
 
 struct WPaintData {