svn merge -r36603:36628 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender.git] / source / blender / editors / sculpt_paint / sculpt.c
index c8f63e871b4049861449c4eef898d7b16eacdd2b..0f514ff4e8f629f60eefb2fffa47730057fa8554 100644 (file)
@@ -2837,65 +2837,6 @@ static const char *sculpt_tool_name(Sculpt *sd)
        }
 }
 
-/**** Radial control ****/
-static int sculpt_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], tex_col[4];
-
-       WM_paint_cursor_end(CTX_wm_manager(C), p->paint_cursor);
-       p->paint_cursor = NULL;
-       brush_radial_control_invoke(op, brush, 1);
-
-       if((brush->flag & BRUSH_DIR_IN) && ELEM4(brush->sculpt_tool, SCULPT_TOOL_DRAW, SCULPT_TOOL_INFLATE, SCULPT_TOOL_CLAY, SCULPT_TOOL_PINCH))
-               copy_v3_v3(col, brush->sub_col);
-       else
-               copy_v3_v3(col, brush->add_col);
-       col[3]= 0.5f;
-                                                                           
-       copy_v3_v3(tex_col, U.sculpt_paint_overlay_col);
-       tex_col[3]= (brush->texture_overlay_alpha / 100.0f);
-
-       RNA_float_set_array(op->ptr, "color", col);
-       RNA_float_set_array(op->ptr, "texture_color", tex_col);
-
-       return WM_radial_control_invoke(C, op, event);
-}
-
-static int sculpt_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, sculpt_poll);
-       return ret;
-}
-
-static int sculpt_radial_control_exec(bContext *C, wmOperator *op)
-{
-       Brush *brush = paint_brush(&CTX_data_tool_settings(C)->sculpt->paint);
-       int ret = brush_radial_control_exec(op, brush, 1);
-
-       WM_event_add_notifier(C, NC_BRUSH|NA_EDITED, brush);
-
-       return ret;
-}
-
-static void SCULPT_OT_radial_control(wmOperatorType *ot)
-{
-       WM_OT_radial_control_partial(ot);
-
-       ot->name= "Sculpt Radial Control";
-       ot->idname= "SCULPT_OT_radial_control";
-
-       ot->invoke= sculpt_radial_control_invoke;
-       ot->modal= sculpt_radial_control_modal;
-       ot->exec= sculpt_radial_control_exec;
-       ot->poll= sculpt_poll;
-
-       ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
-}
-
 /**** Operator for applying a stroke (various attributes including mouse path)
          using the current brush. ****/
 
@@ -3784,7 +3725,6 @@ static void SCULPT_OT_sculptmode_toggle(wmOperatorType *ot)
 
 void ED_operatortypes_sculpt(void)
 {
-       WM_operatortype_append(SCULPT_OT_radial_control);
        WM_operatortype_append(SCULPT_OT_brush_stroke);
        WM_operatortype_append(SCULPT_OT_sculptmode_toggle);
        WM_operatortype_append(SCULPT_OT_set_persistent_base);