Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 31 Jul 2018 06:24:12 +0000 (16:24 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 31 Jul 2018 06:24:12 +0000 (16:24 +1000)
commit65344a6d1980082383993eaebf94b5647834c55c
treee97e12f9f04516e9499267966dbd09f98160f516
parent52c23021c4367511969c5868ea04e61fb49e94d3
parent18888b7b0c3556d3a2177fe7693fda02bf2a8cb5
Merge branch 'master' into blender2.8
release/scripts/startup/bl_ui/space_userpref.py
source/blender/editors/interface/interface_style.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_userdef.c