diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-04-18 17:30:13 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-04-18 17:30:13 +0300 |
| commit | c9d78b6c434b5b1672ad0e0a2854eb9c1199f379 (patch) | |
| tree | 47647ceb5a78cb951768bb03fbca0322e52fe2b2 /source/blender/editors/curve/editcurve.c | |
| parent | bc6a75b405c4e0b1e85c9c6ec6646fd2d3f67686 (diff) | |
| parent | 70018eb16e721f9171834afd4bf70dc017af1369 (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'source/blender/editors/curve/editcurve.c')
| -rw-r--r-- | source/blender/editors/curve/editcurve.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 57805f92c8a..9e3344914bb 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -6049,6 +6049,9 @@ int join_curve_exec(bContext *C, wmOperator *op) cu = ob->data; BLI_movelisttolist(&cu->nurb, &tempbase); + /* Account for mixed 2D/3D curves when joining */ + BKE_curve_curve_dimension_update(cu); + DAG_relations_tag_update(bmain); // because we removed object(s), call before editmode! DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA); |