Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 25 Jul 2017 10:53:10 +0000 (20:53 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 25 Jul 2017 10:53:10 +0000 (20:53 +1000)
commitb97bf844b36f2e54d8dedb66aaf19f7ce48fefe5
tree67a2a8656204c496dd29d61938cb6efd3df4433d
parent8a2fdb3749d74fa34243c0a53b173eb330962d62
parentedc6bec9d60204cb81d2e7533402630b076d0d32
Merge branch 'master' into blender2.8