Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 14 Aug 2017 02:13:55 +0000 (12:13 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 14 Aug 2017 02:13:55 +0000 (12:13 +1000)
commit230be97284de444e6b2566f535141ca31647f6ab
tree2cedfed045fb8c015d0fe4fbf65de5623fff1a55
parenteccaa6da26b8fc58481367524725413349dd9059
parenta8fbe991cd5293f077fa946296b6caad18d0f5ab
Merge branch 'master' into blender2.8