Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 19 Jun 2018 06:15:03 +0000 (08:15 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 19 Jun 2018 06:15:03 +0000 (08:15 +0200)
commitbd3fe54b0d1fae577813d1b2850d5da57dbb1fe5
treec31b19e096d26d9619f77e3a34ba771bcdf2e590
parent8c77c3653996516ba152eade2c27980ae20a1198
parentf0c6f5ee77f3739658e33a7e8995bca381a7afeb
Merge branch 'master' into blender2.8