Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 21 Jun 2018 14:43:39 +0000 (16:43 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 21 Jun 2018 14:43:39 +0000 (16:43 +0200)
commit78653cfb8cf53074a107e09bfe46c36192aa54d7
tree5f5065ed0d7725f7a1e91cc7dd1eb116b581a062
parentc45a3b80e2356a952248eaafaeeec48b28bcb0fd
parent84dbf949d7263d22b8b87f1532a00db80ac12fab
Merge branch 'master' into blender2.8
intern/cycles/blender/addon/version_update.py
source/blender/editors/interface/interface_handlers.c