Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 12 Sep 2018 06:21:00 +0000 (16:21 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 12 Sep 2018 06:21:00 +0000 (16:21 +1000)
commit265b5238de738a821bed0c56fb0ef3abefae0d05
tree2a885fe1c94ede6df4be31ac436387cb2a6ad115
parent2597cd39982100efeeb13b597f3e432ef9346d85
parenta8c924423e2e7103aff60c21e901dc239b54c610
Merge branch 'master' into blender2.8
source/blender/editors/interface/interface_widgets.c
source/blender/makesdna/DNA_userdef_types.h