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)
commit70841e58c42ec9381c16db4e98109a3d165cd841
treeeea06a7dbace1adcbed2e85206c7c5b9ef566932
parent6ffc6b30aa1477eb09a48d318d2b19d7e068cb23
parent653746f5f829e399fe85b4c1d0707a69ee16b3aa
Merge branch 'master' into blender2.8
release/scripts/startup/bl_ui/space_userpref.py
source/blender/blenloader/intern/writefile.c