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)
commitf3065ed36572b4a037e79395a4a729d146eeafd2
treef6509efe458fc54fe8e508f610109bec56521762
parentb01392e9ac338d8816e30d076577af7598c36a9e
parent274bde23fb57c014af727fb787c6e8a3342f6240
Merge branch 'master' into blender2.8
CMakeLists.txt
source/blender/editors/interface/interface_widgets.c