Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 15 Sep 2017 12:44:07 +0000 (22:44 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 15 Sep 2017 12:44:07 +0000 (22:44 +1000)
commit4fae536f60a9c37d74a73660520bb569afc4c92a
tree530593198598fa824d439c8d1ab3ec27147c0a3f
parent0c5ff0e55857f52a48506368c6b9b22288a7e95e
parent378b74f0251798ae4024517b4a1ff9e810d3c48c
Merge branch 'master' into blender2.8