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)
commitc36f4a7f7f370ebb6e944d9893d2677232d3b7f8
treec2030541dcaae70b2892c6838e8a3e76e24843e1
parentcc63c8511cb18cc59fb2874dd5a57d89b7123bac
parentb415ed55a74c51b944cd0682fc7a81679778ac8f
Merge branch 'master' into blender2.8

Conflicts:
source/blender/blenkernel/intern/blender.c
source/blender/makesdna/DNA_ID.h
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