Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 26 Apr 2018 12:36:00 +0000 (14:36 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 26 Apr 2018 12:36:00 +0000 (14:36 +0200)
commit26644cd424cb215eb9ae77d77d25e2a6a85ad33e
tree687bed765b2f824bccd2e989366acb8c09c4b394
parent3f1df6f6fc098c2eff4efc1f916132ba7a6d94a9
parent57405054b21ccc3a1aee3ab8bcae66cf8f7ca5fb
Merge branch 'master' into blender2.8