Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sun, 27 May 2018 19:10:43 +0000 (21:10 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 27 May 2018 19:10:43 +0000 (21:10 +0200)
commit95c5d1193f12375cd7423be9bde1606cd0a05809
treef49a96b46897fcc0d3143182b7895e16e2dae94c
parent9c8da501063e59cc82ca3c5c614a2aaf6e351206
parentfd2c48726fd27ff1335c4adbe251fb1e076d8266
Merge branch 'master' into blender2.8
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_widgets.c