Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 25 May 2017 00:48:14 +0000 (02:48 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 25 May 2017 00:48:14 +0000 (02:48 +0200)
commitc7c6070a6469055a1a503acec47780a2de30c218
tree38dddd0dc2843a9dcab298f9f35329e5e6c575d5
parent45ff4a807a2acee29cb82c04f294ab58348627b6
parentbbce6ce249f8964e9dbf2e1f13cadad15126f9b9
Merge branch 'master' into blender2.8