Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 4 Jan 2018 09:36:50 +0000 (10:36 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 4 Jan 2018 09:36:50 +0000 (10:36 +0100)
1  2 
source/blender/blenkernel/intern/blender.c
source/blender/editors/curve/editcurve.c

index 60dad141e0b2e0fa71e8e516df80293b19788871,7a61ef2abac5a14e71d8aa3fb0377834b5f29bab..0b368df57eddf3c11552d21ab0eb00f1fbf319fd
@@@ -277,9 -268,8 +272,10 @@@ void BKE_blender_userdef_app_template_d
  
        DATA_SWAP(font_path_ui);
        DATA_SWAP(font_path_ui_mono);
+       DATA_SWAP(keyconfigstr);
  
 +      DATA_SWAP(manipulator_flag);
 +
  #undef SWAP_TYPELESS
  #undef LIST_SWAP
  #undef DATA_SWAP
index 79b63f36b76358a32a273470046202ead8ed8575,f4ee05636c7bfc62cf516b020e121ae492a46fe5..4b578ba389ebc1f1f387cd5fc06f94ed368e2d59
@@@ -6135,12 -6131,14 +6135,14 @@@ int join_curve_exec(bContext *C, wmOper
        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!
 +      DEG_relations_tag_update(bmain);   // because we removed object(s), call before editmode!
  
 -      DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA);
 +      DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA);
  
        WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, scene);