Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 29 Nov 2017 05:15:21 +0000 (16:15 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 29 Nov 2017 05:15:21 +0000 (16:15 +1100)
commit639d49b01fdab537ed4782adcb4da260a9c2a854
treeec3f1a13ba4930eb3b379642b338ef671ea5dc2d
parentddc7e72fe1f1275e2e9f9ee858c80e6b375c5820
parentc17c6557b4ea4bfeb4528b74703795798aedaa66
Merge branch 'master' into blender2.8