[Bf-blender-cvs] [457dc8d12ca] master: Fix T53586: Surfaces collapse when joined

[Campbell Barton]

Commit: 457dc8d12ca79247349aa3e76457a9f45e73026e
Author: Campbell Barton
Date:   Thu Jan 4 16:01:27 2018 +1100
Branches: master
https://developer.blender.org/rB457dc8d12ca79247349aa3e76457a9f45e73026e

Fix T53586: Surfaces collapse when joined

===================================================================

M	source/blender/editors/curve/editcurve.c

===================================================================

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!