Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / curve / editcurve.c
index 79b63f36b76358a32a273470046202ead8ed8575..4b578ba389ebc1f1f387cd5fc06f94ed368e2d59 100644 (file)
@@ -6135,8 +6135,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);
+       }
 
        DEG_relations_tag_update(bmain);   // because we removed object(s), call before editmode!