From 457dc8d12ca79247349aa3e76457a9f45e73026e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 4 Jan 2018 16:01:27 +1100 Subject: [PATCH] Fix T53586: Surfaces collapse when joined --- source/blender/editors/curve/editcurve.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index fc363475608..f4ee05636c7 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -6131,8 +6131,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); + } DAG_relations_tag_update(bmain); // because we removed object(s), call before editmode!