Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 11 Jan 2018 13:35:36 +0000 (14:35 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 11 Jan 2018 13:35:36 +0000 (14:35 +0100)
Conflicts:
source/blender/blenkernel/intern/blender.c
source/blender/makesdna/DNA_ID.h

1  2 
release/scripts/startup/bl_ui/space_userpref.py
source/blender/blenkernel/intern/blender.c
source/blender/editors/interface/resources.c
source/blender/editors/screen/area.c
source/blender/editors/transform/transform_orientations.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_userdef.c

index 0b368df57eddf3c11552d21ab0eb00f1fbf319fd,bc47cfde143f7c176251ff0490846e25f55d68c7..d03be79baade1514ab06b866758df0f5865952fb
@@@ -274,11 -280,11 +284,14 @@@ void BKE_blender_userdef_app_template_d
        DATA_SWAP(font_path_ui_mono);
        DATA_SWAP(keyconfigstr);
  
- #undef LIST_SWAP
 +      DATA_SWAP(manipulator_flag);
 +
+       FLAG_SWAP(uiflag, int, USER_LOCK_UI_LAYOUT);
 +#undef SWAP_TYPELESS
  #undef DATA_SWAP
+ #undef LIST_SWAP
+ #undef FLAG_SWAP
  }
  
  void BKE_blender_userdef_app_template_data_set(UserDef *userdef)
Simple merge