diff options
author | Philipp Oeser <info@graphics-engineer.com> | 2020-02-04 23:24:48 +0300 |
---|---|---|
committer | Philipp Oeser <info@graphics-engineer.com> | 2020-02-04 23:24:48 +0300 |
commit | 78ba097331c4b12b7c3cddf89a35135efcdcf17e (patch) | |
tree | ab7b1764e73e8567ff2b1a49d28f253d41446629 /source/blender/editors | |
parent | f3fec859ba5d79134dfe34ecfcf5c2962035569f (diff) | |
parent | 559d01e12949a730f3497fdfbe79a11f532f3afe (diff) |
Merge branch 'blender-v2.82-release'
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/curve/editcurve.c | 5 | ||||
-rw-r--r-- | source/blender/editors/gpencil/gpencil_convert.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index e7803fdaafb..f5920bfb258 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -4002,14 +4002,15 @@ static int set_spline_type_exec(bContext *C, wmOperator *op) for (nu = editnurb->first; nu; nu = nu->next) { if (ED_curve_nurb_select_check(v3d, nu)) { const int pntsu_prev = nu->pntsu; - if (BKE_nurb_type_convert(nu, type, use_handles)) { + const char *err_msg = NULL; + if (BKE_nurb_type_convert(nu, type, use_handles, &err_msg)) { changed = true; if (pntsu_prev != nu->pntsu) { changed_size = true; } } else { - BKE_report(op->reports, RPT_ERROR, "No conversion possible"); + BKE_report(op->reports, RPT_ERROR, err_msg); } } } diff --git a/source/blender/editors/gpencil/gpencil_convert.c b/source/blender/editors/gpencil/gpencil_convert.c index 1ce4ffbbd46..e1b13747ee0 100644 --- a/source/blender/editors/gpencil/gpencil_convert.c +++ b/source/blender/editors/gpencil/gpencil_convert.c @@ -1385,7 +1385,7 @@ static void gp_layer_to_curve(bContext *C, if (mode == GP_STROKECONVERT_POLY) { for (nu = cu->nurb.first; nu; nu = nu->next) { - BKE_nurb_type_convert(nu, CU_POLY, false); + BKE_nurb_type_convert(nu, CU_POLY, false, NULL); } } |