Fix T53586: Surfaces collapse when joined

2018-01-04 16:01:27 +11:00
parent 9b65560934
commit 457dc8d12c
1 changed files with 4 additions and 2 deletions
--- 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!