[Bf-blender-cvs] [97c9c6a3f32] master: Fix T51149: Joining curves allows 2D curves in 3D

[Campbell Barton]

Commit: 97c9c6a3f321f35f0b58ab167aea97a790c94cfb
Author: Campbell Barton
Date:   Sat Apr 15 16:50:12 2017 +1000
Branches: master
https://developer.blender.org/rB97c9c6a3f321f35f0b58ab167aea97a790c94cfb

Fix T51149: Joining curves allows 2D curves in 3D

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

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

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

diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c
index 47f42ab5321..648fe930030 100644
--- a/source/blender/editors/curve/editcurve.c
+++ b/source/blender/editors/curve/editcurve.c
@@ -6047,6 +6047,9 @@ 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);
+
 	DAG_relations_tag_update(bmain);   // because we removed object(s), call before editmode!
 
 	DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA);