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

[Bastien Montagne]

Commit: c36f4a7f7f370ebb6e944d9893d2677232d3b7f8
Author: Bastien Montagne
Date:   Thu Jan 11 14:35:36 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBc36f4a7f7f370ebb6e944d9893d2677232d3b7f8

Merge branch 'master' into blender2.8

Conflicts:
	source/blender/blenkernel/intern/blender.c
	source/blender/makesdna/DNA_ID.h

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



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

diff --cc source/blender/blenkernel/intern/blender.c
index 0b368df57ed,bc47cfde143..d03be79baad
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@@ -274,11 -280,11 +284,14 @@@ void BKE_blender_userdef_app_template_d
  	DATA_SWAP(font_path_ui_mono);
  	DATA_SWAP(keyconfigstr);
  
 +	DATA_SWAP(manipulator_flag);
 +
+ 	FLAG_SWAP(uiflag, int, USER_LOCK_UI_LAYOUT);
+ 
 +#undef SWAP_TYPELESS
- #undef LIST_SWAP
  #undef DATA_SWAP
+ #undef LIST_SWAP
+ #undef FLAG_SWAP
  }
  
  void BKE_blender_userdef_app_template_data_set(UserDef *userdef)