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/blenkernel | |
| parent | f3fec859ba5d79134dfe34ecfcf5c2962035569f (diff) | |
| parent | 559d01e12949a730f3497fdfbe79a11f532f3afe (diff) | |
Merge branch 'blender-v2.82-release'
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/BKE_curve.h | 5 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/curve.c | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_curve.h b/source/blender/blenkernel/BKE_curve.h index e03780cc027..cf516c630c5 100644 --- a/source/blender/blenkernel/BKE_curve.h +++ b/source/blender/blenkernel/BKE_curve.h @@ -220,7 +220,10 @@ bool BKE_nurb_order_clamp_u(struct Nurb *nu); bool BKE_nurb_order_clamp_v(struct Nurb *nu); void BKE_nurb_direction_switch(struct Nurb *nu); -bool BKE_nurb_type_convert(struct Nurb *nu, const short type, const bool use_handles); +bool BKE_nurb_type_convert(struct Nurb *nu, + const short type, + const bool use_handles, + const char **r_err_msg); void BKE_nurb_points_add(struct Nurb *nu, int number); void BKE_nurb_bezierPoints_add(struct Nurb *nu, int number); diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index 4f0ff8bdcd3..8246c3d9ff4 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -4869,7 +4869,10 @@ bool BKE_nurb_order_clamp_v(struct Nurb *nu) /** * \note caller must ensure active vertex remains valid. */ -bool BKE_nurb_type_convert(Nurb *nu, const short type, const bool use_handles) +bool BKE_nurb_type_convert(Nurb *nu, + const short type, + const bool use_handles, + const char **r_err_msg) { BezTriple *bezt; BPoint *bp; @@ -4976,6 +4979,9 @@ bool BKE_nurb_type_convert(Nurb *nu, const short type, const bool use_handles) nr = nu->pntsu / 3; if (nr < 2) { + if (r_err_msg != NULL) { + *r_err_msg = "At least 6 points required for conversion"; + } return false; /* conversion impossible */ } else { |