Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 6 Jul 2018 05:56:08 +0000 (07:56 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 6 Jul 2018 05:56:08 +0000 (07:56 +0200)
commit5b3545f99f2632b86e07dbe25343b46910be0483
tree13f6e051f70df3fbbfe2e1267873bdfdfaab71b1
parent288bcb2593f52c47225da9ea8efe13d288d35892
parentd56b90705e81768ca1a586b622ef4bbe3b216d5c
Merge branch 'master' into blender2.8
source/blender/editors/interface/resources.c