Revision: 19253 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19253 Author: nicholasbishop Date: 2009-03-11 01:52:00 +0100 (Wed, 11 Mar 2009)
Log Message: ----------- Simplified vpaint/wpaint radial control calls. Removed also some unused radial control code. Modified Paths: -------------- branches/blender2.5/blender/source/blender/editors/physics/editparticle.c branches/blender2.5/blender/source/blender/editors/sculpt_paint/paint_vertex.c branches/blender2.5/blender/source/blender/editors/sculpt_paint/sculpt.c Modified: branches/blender2.5/blender/source/blender/editors/physics/editparticle.c =================================================================== --- branches/blender2.5/blender/source/blender/editors/physics/editparticle.c 2009-03-11 00:43:08 UTC (rev 19252) +++ branches/blender2.5/blender/source/blender/editors/physics/editparticle.c 2009-03-11 00:52:00 UTC (rev 19253) @@ -2312,7 +2312,6 @@ 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 @@ else if(mode == WM_RADIALCONTROL_STRENGTH) brush->strength= new_value; - WM_radial_control_string(op, str, 256); - return OPERATOR_FINISHED; } Modified: branches/blender2.5/blender/source/blender/editors/sculpt_paint/paint_vertex.c =================================================================== --- branches/blender2.5/blender/source/blender/editors/sculpt_paint/paint_vertex.c 2009-03-11 00:43:08 UTC (rev 19252) +++ branches/blender2.5/blender/source/blender/editors/sculpt_paint/paint_vertex.c 2009-03-11 00:52:00 UTC (rev 19253) @@ -1171,36 +1171,10 @@ /* ************ 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_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_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) Modified: branches/blender2.5/blender/source/blender/editors/sculpt_paint/sculpt.c =================================================================== --- branches/blender2.5/blender/source/blender/editors/sculpt_paint/sculpt.c 2009-03-11 00:43:08 UTC (rev 19252) +++ branches/blender2.5/blender/source/blender/editors/sculpt_paint/sculpt.c 2009-03-11 00:52:00 UTC (rev 19253) @@ -1275,11 +1275,7 @@ 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) _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs