Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 13 Sep 2018 07:56:32 +0000 (17:56 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 13 Sep 2018 07:56:32 +0000 (17:56 +1000)
commitd538de90a7ac2179f8c8bd235c24bf12d10e0ef3
treeb0f6bffd7b76d07f9da78bc88aecadc445ae0a47
parentc197c210e48c708eb380849488bd082adbc044eb
parent9900addf11d9a5b964aa745cf141998195f7c8db
Merge branch 'master' into blender2.8