Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 28 Jul 2017 15:46:27 +0000 (01:46 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 28 Jul 2017 15:46:27 +0000 (01:46 +1000)
commitc558763ef562d407384dba37ffab612099df4916
treecc510e6347f0ddc5d1811d7a21f19d23e263331f
parente39dc48bd51c6ba5ba72f2ebdf66a91ac6630170
parente03883065042412347e7b72a4102532d7b1fc495
Merge branch 'master' into blender2.8
release/scripts/startup/bl_ui/space_userpref.py
source/blender/blenkernel/intern/particle_system.c
source/blender/blenloader/intern/versioning_defaults.c
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_layout.c
source/blender/editors/interface/resources.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_userdef.c