Simplified vpaint/wpaint radial control calls. Removed also some unused radial contro...

diff --git a/source/blender/editors/physics/editparticle.c b/source/blender/editors/physics/editparticle.c
index b3c7be688f276295fd1c8e61f79fabe3fded7d48..272383ab651328ef4123cbf8539ae78f8daa804d 100644 (file)
--- a/source/blender/editors/physics/editparticle.c
+++ b/source/blender/editors/physics/editparticle.c
@@ -2312,7 +2312,6 @@ static int brush_radial_control_exec(bContext *C, wmOperator *op)
        ParticleBrushData *brush;
        int mode = RNA_enum_get(op->ptr, "mode");
        float new_value = RNA_float_get(op->ptr, "new_value");
-       char str[256];
 
        if(pset->brushtype < 0)
                return OPERATOR_CANCELLED;
@@ -2324,8 +2323,6 @@ static int brush_radial_control_exec(bContext *C, wmOperator *op)
        else if(mode == WM_RADIALCONTROL_STRENGTH)
                brush->strength= new_value;
 
-       WM_radial_control_string(op, str, 256);
-
        return OPERATOR_FINISHED;
 }
 

diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c
index 60b1fc04064fba3d18fc378bbe1349cd008c3e51..0c20c0cc1cf91e5eabd7ee0562ef1edfef69910e 100644 (file)
--- a/source/blender/editors/sculpt_paint/paint_vertex.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex.c
@@ -1171,36 +1171,10 @@ void PAINT_OT_weight_paint_toggle(wmOperatorType *ot)
 
 /* ************ paint radial controls *************/
 
-void paint_radial_control_invoke(wmOperator *op, VPaint *vp)
-{
-       int mode = RNA_int_get(op->ptr, "mode");
-       float original_value;
-
-       if(mode == WM_RADIALCONTROL_SIZE)
-               original_value = vp->brush->size;
-       else if(mode == WM_RADIALCONTROL_STRENGTH)
-               original_value = vp->brush->alpha;
-
-       RNA_float_set(op->ptr, "initial_value", original_value);
-}
-
-static int paint_radial_control_exec(wmOperator *op, VPaint *vp)
-{
-       int mode = RNA_int_get(op->ptr, "mode");
-       float new_value = RNA_float_get(op->ptr, "new_value");
-
-       if(mode == WM_RADIALCONTROL_SIZE)
-               vp->brush->size = new_value;
-       else if(mode == WM_RADIALCONTROL_STRENGTH)
-               vp->brush->alpha = new_value;
-
-       return OPERATOR_FINISHED;
-}
-
 static int vpaint_radial_control_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
        toggle_paint_cursor(C, 0);
-       paint_radial_control_invoke(op, CTX_data_scene(C)->toolsettings->vpaint);
+       brush_radial_control_invoke(op, CTX_data_scene(C)->toolsettings->vpaint->brush, 1);
        return WM_radial_control_invoke(C, op, event);
 }
 
@@ -1214,16 +1188,13 @@ static int vpaint_radial_control_modal(bContext *C, wmOperator *op, wmEvent *eve
 
 static int vpaint_radial_control_exec(bContext *C, wmOperator *op)
 {
-       int ret = paint_radial_control_exec(op, CTX_data_scene(C)->toolsettings->vpaint);
-       char str[256];
-       WM_radial_control_string(op, str, 256);
-       return ret;
+       return brush_radial_control_exec(op, CTX_data_scene(C)->toolsettings->vpaint->brush, 1);
 }
 
 static int wpaint_radial_control_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
        toggle_paint_cursor(C, 1);
-       paint_radial_control_invoke(op, CTX_data_scene(C)->toolsettings->wpaint);
+       brush_radial_control_invoke(op, CTX_data_scene(C)->toolsettings->wpaint->brush, 1);
        return WM_radial_control_invoke(C, op, event);
 }
 
@@ -1237,10 +1208,7 @@ static int wpaint_radial_control_modal(bContext *C, wmOperator *op, wmEvent *eve
 
 static int wpaint_radial_control_exec(bContext *C, wmOperator *op)
 {
-       int ret = paint_radial_control_exec(op, CTX_data_scene(C)->toolsettings->wpaint);
-       char str[256];
-       WM_radial_control_string(op, str, 256);
-       return ret;
+       return brush_radial_control_exec(op, CTX_data_scene(C)->toolsettings->wpaint->brush, 1);
 }
 
 void PAINT_OT_weight_paint_radial_control(wmOperatorType *ot)

diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index d9616f95a05aba2e573a4370f860c00dbfa65361..8f1e382631428b6b220f00cda0a095b7390c6f89 100644 (file)
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -1275,11 +1275,7 @@ static int sculpt_radial_control_modal(bContext *C, wmOperator *op, wmEvent *eve
 
 static int sculpt_radial_control_exec(bContext *C, wmOperator *op)
 {
-       int ret = brush_radial_control_exec(op, CTX_data_scene(C)->toolsettings->sculpt->brush, 1);
-       char str[256];
-       WM_radial_control_string(op, str, 256);
-
-       return ret;
+       return brush_radial_control_exec(op, CTX_data_scene(C)->toolsettings->sculpt->brush, 1);
 }
 
 static void SCULPT_OT_radial_control(wmOperatorType *ot)