[Bf-blender-cvs] [5a6a819b5d8] blender2.8: Merge branch 'master' into blender2.8

[Bastien Montagne]

Commit: 5a6a819b5d896da6a528615bce069d6ee9d9c85c
Author: Bastien Montagne
Date:   Thu Jan 4 10:36:50 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB5a6a819b5d896da6a528615bce069d6ee9d9c85c

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/blenkernel/intern/blender.c
index 60dad141e0b,7a61ef2abac..0b368df57ed
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@@ -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
diff --cc source/blender/editors/curve/editcurve.c
index 79b63f36b76,f4ee05636c7..4b578ba389e
--- a/source/blender/editors/curve/editcurve.c
+++ b/source/blender/editors/curve/editcurve.c
@@@ -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);