Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 28 Jun 2018 08:50:04 +0000 (10:50 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 28 Jun 2018 08:50:04 +0000 (10:50 +0200)
1  2 
CMakeLists.txt
source/blender/editors/interface/interface_widgets.c

diff --cc CMakeLists.txt
Simple merge