Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 4 Sep 2018 07:34:46 +0000 (17:34 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 4 Sep 2018 07:34:46 +0000 (17:34 +1000)
commite913e79fb51cb48d880473c82c00ca39c73cdca2
treec420c41c280ca3b754001dc8b1a7bf69f937975f
parent621b16468ef72fb88cb1b6833a25479cb5dbd66d
parent8cd6e22ec0c1eace9107e7425abc00e9938b26c8
Merge branch 'master' into blender2.8