diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-13 06:24:41 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-13 06:25:36 +0300 |
| commit | 184ab749c38a6e90744022a030bec6a6ee584a0a (patch) | |
| tree | c7ed0a96e402dbbd7225447ec3249dce4c1a322b /source/blender/editors/curve | |
| parent | 97062a1b9b2c89a9372b5870418684551b111bab (diff) | |
| parent | fe566a30f3c7ae835c1f2750fb773073b8e40622 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/curve')
| -rw-r--r-- | source/blender/editors/curve/editcurve.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/curve/editcurve_add.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index dce28a1ec5a..73cebd257f4 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -1261,7 +1261,7 @@ void ED_curve_editnurb_make(Object *obedit) nu = cu->nurb.first; while (nu) { newnu = BKE_nurb_duplicate(nu); - BKE_nurb_test2D(newnu); // after join, or any other creation of curve + BKE_nurb_test_2d(newnu); // after join, or any other creation of curve BLI_addtail(&editnurb->nurbs, newnu); nu = nu->next; } @@ -1640,7 +1640,7 @@ void ed_editnurb_translate_flag(ListBase *editnurb, short flag, const float vec[ } } - BKE_nurb_test2D(nu); + BKE_nurb_test_2d(nu); } } diff --git a/source/blender/editors/curve/editcurve_add.c b/source/blender/editors/curve/editcurve_add.c index 23ce7bac338..2dd3b21b875 100644 --- a/source/blender/editors/curve/editcurve_add.c +++ b/source/blender/editors/curve/editcurve_add.c @@ -464,7 +464,7 @@ Nurb *ED_curve_add_nurbs_primitive(bContext *C, Object *obedit, float mat[4][4], cu->actnu = BLI_listbase_count(editnurb); cu->actvert = CU_ACT_NONE; - BKE_nurb_test2D(nu); + BKE_nurb_test_2d(nu); } return nu; |