Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 26 Sep 2018 01:42:38 +0000 (11:42 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 26 Sep 2018 01:42:38 +0000 (11:42 +1000)
commit77b381bd35f8d4c53b403c382c2301c0baa722a0
treebe5e9c620db885cbe500eb4dc1737d604aad59bd
parent07747bcd67b6c8a829febeb34b64c47d0ad8a344
parent63658ae76dcadf2404616fa8e6659f5ef63e5c49
Merge branch 'master' into blender2.8