Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 1 Feb 2018 04:18:58 +0000 (15:18 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 1 Feb 2018 04:18:58 +0000 (15:18 +1100)
1  2 
release/scripts/startup/bl_ui/space_userpref.py
source/blender/blenloader/intern/writefile.c