Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 27 Jul 2018 07:41:58 +0000 (17:41 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 27 Jul 2018 07:41:58 +0000 (17:41 +1000)
commit0093212be983c20ca7030bedec5699b79a663071
tree4a89e4a037d0e1240de0b32c9b3886fa184df0d6
parent2032e4ec9edd33235bb496e7828dcc2fd7210ac0
parentfe8d8aa27e26f1f8e4d5e1e3fcb6fc6288ebf226
Merge branch 'master' into blender2.8