diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-04-04 11:34:04 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-04-04 11:36:38 +0300 |
| commit | f4875bed89de6500f333df3a87001919e95ec346 (patch) | |
| tree | a6c5c899923d03d86e9f188a13ba10f92ecdc10e /source/blender/editors | |
| parent | 0a7ed17099c6249b8f6d90e210fd75270e25ad15 (diff) | |
Fix curve editmode adding 3D primitives w/ 2D curves
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/curve/editcurve_add.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/editors/curve/editcurve_add.c b/source/blender/editors/curve/editcurve_add.c index 246f089d77e..cc8e272d4f7 100644 --- a/source/blender/editors/curve/editcurve_add.c +++ b/source/blender/editors/curve/editcurve_add.c @@ -121,7 +121,6 @@ Nurb *ED_curve_add_nurbs_primitive(bContext *C, Object *obedit, float mat[4][4], const float grid = 1.0f; const int cutype = (type & CU_TYPE); // poly, bezier, nurbs, etc const int stype = (type & CU_PRIMITIVE); - const bool force_3d = (((Curve *)obedit->data)->flag & CU_3D) != 0; /* could be adding to an existing 3D curve */ unit_m4(umat); unit_m4(viewmat); @@ -145,7 +144,6 @@ Nurb *ED_curve_add_nurbs_primitive(bContext *C, Object *obedit, float mat[4][4], case CU_PRIM_CURVE: /* curve */ nu->resolu = cu->resolu; if (cutype == CU_BEZIER) { - if (!force_3d) nu->flag |= CU_2D; nu->pntsu = 2; nu->bezt = (BezTriple *)MEM_callocN(2 * sizeof(BezTriple), "addNurbprim1"); bezt = nu->bezt; @@ -247,7 +245,6 @@ Nurb *ED_curve_add_nurbs_primitive(bContext *C, Object *obedit, float mat[4][4], nu->resolu = cu->resolu; if (cutype == CU_BEZIER) { - if (!force_3d) nu->flag |= CU_2D; nu->pntsu = 4; nu->bezt = (BezTriple *)MEM_callocN(sizeof(BezTriple) * 4, "addNurbprim1"); nu->flagu = CU_NURB_CYCLIC; @@ -459,6 +456,10 @@ Nurb *ED_curve_add_nurbs_primitive(bContext *C, Object *obedit, float mat[4][4], BLI_assert(nu != NULL); if (nu) { /* should always be set */ + if ((obedit->type != OB_SURF) && ((cu->flag & CU_3D) == 0)) { + nu->flag |= CU_2D; + } + nu->flag |= CU_SMOOTH; cu->actnu = BLI_listbase_count(editnurb); cu->actvert = CU_ACT_NONE; |