diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-11-05 08:05:00 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-11-05 08:05:00 +0300 |
commit | 016a5750023054a8280cb37bd5de4a93b2161203 (patch) | |
tree | dc18ce8d2643d9eae88dfdd8f1a15d8d890717a6 /source/blender/editors/curve | |
parent | 3a4dade2f8da0e581771b159ca030e4a105e84ff (diff) | |
parent | 68e86c4816a0fb18a8bd393d938dc8f95c1d0807 (diff) |
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'source/blender/editors/curve')
-rw-r--r-- | source/blender/editors/curve/editcurve.c | 17 | ||||
-rw-r--r-- | source/blender/editors/curve/editcurve_select.c | 9 |
2 files changed, 5 insertions, 21 deletions
diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 029c8b05923..46bf1f6c9b5 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -1437,20 +1437,13 @@ static int separate_exec(bContext *C, wmOperator *op) /* Some curves changed, but some curves failed: don't explain why it failed. */ if (status.changed) { - BKE_reportf(op->reports, - RPT_INFO, - tot_errors == 1 ? "%d curve could not be separated" : - "%d curves could not be separated", - tot_errors); + BKE_reportf(op->reports, RPT_INFO, "%d curve(s) could not be separated", tot_errors); return OPERATOR_FINISHED; } /* All curves failed: If there is more than one error give a generic error report. */ if (((status.error_vertex_keys ? 1 : 0) + (status.error_generic ? 1 : 0)) > 1) { - BKE_report(op->reports, - RPT_ERROR, - tot_errors == 1 ? "Could not separate selected curves" : - "Could not separate selected curve"); + BKE_report(op->reports, RPT_ERROR, "Could not separate selected curve(s)"); } /* All curves failed due to the same error. */ @@ -4708,11 +4701,7 @@ static int make_segment_exec(bContext *C, wmOperator *op) if (tot_errors > 0) { /* Some curves changed, but some curves failed: don't explain why it failed. */ if (status.changed) { - BKE_reportf(op->reports, - RPT_INFO, - tot_errors == 1 ? "%d curve could not make segments" : - "%d curves could not make segments", - tot_errors); + BKE_reportf(op->reports, RPT_INFO, "%d curves could not make segments", tot_errors); return OPERATOR_FINISHED; } diff --git a/source/blender/editors/curve/editcurve_select.c b/source/blender/editors/curve/editcurve_select.c index 721aa7afecc..a76e73d3cf1 100644 --- a/source/blender/editors/curve/editcurve_select.c +++ b/source/blender/editors/curve/editcurve_select.c @@ -1464,15 +1464,10 @@ static int select_nth_exec(bContext *C, wmOperator *op) if (!changed) { if (obact->type == OB_SURF) { - BKE_report( - op->reports, - RPT_ERROR, - (objects_len == 1 ? "Surface has no active point" : "Surfaces have no active point")); + BKE_report(op->reports, RPT_ERROR, "Surface(s) have no active point"); } else { - BKE_report(op->reports, - RPT_ERROR, - (objects_len == 1 ? "Curve has no active point" : "Curves have no active point")); + BKE_report(op->reports, RPT_ERROR, "Curve(s) have no active point"); } return OPERATOR_CANCELLED; } |