diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-01-04 12:36:50 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-01-04 12:36:50 +0300 |
commit | 5a6a819b5d896da6a528615bce069d6ee9d9c85c (patch) | |
tree | bdbdc6f742ddda3f063df4655933d736a1644eef /source/blender/editors/curve | |
parent | 727aab5af414ed774226fa5ee77aeef2ca61b520 (diff) | |
parent | 457dc8d12ca79247349aa3e76457a9f45e73026e (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/curve')
-rw-r--r-- | source/blender/editors/curve/editcurve.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 79b63f36b76..4b578ba389e 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -6135,8 +6135,10 @@ 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); + if (ob->type == OB_CURVE) { + /* Account for mixed 2D/3D curves when joining */ + BKE_curve_curve_dimension_update(cu); + } DEG_relations_tag_update(bmain); // because we removed object(s), call before editmode! |