Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-01-04 08:01:27 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-01-04 08:01:27 +0300
commit457dc8d12ca79247349aa3e76457a9f45e73026e (patch)
tree065fe928df0124a34711f3713ac11c3ed4c069bc /source/blender/editors/curve
parent9b655609343f5b42a7a26af57e09ed44d6c95656 (diff)
Fix T53586: Surfaces collapse when joined
Diffstat (limited to 'source/blender/editors/curve')
-rw-r--r--source/blender/editors/curve/editcurve.c6
1 files 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!