Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 31 Jul 2018 07:03:28 +0000 (17:03 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 31 Jul 2018 07:03:28 +0000 (17:03 +1000)
commit5300ba0ba50efb1656a2effa1053fb60875398ef
treeffde96caaec1f71bc75286bf78f8c570cac6b8fe
parentb51dcb6f07f34c904b036887e24f96542d9fb76d
parent21f61cbe73a1bc24d2e74b82b039ea5f36c960a5
Merge branch 'master' into blender2.8
source/blender/blenfont/BLF_api.h
source/blender/blenfont/intern/blf.c
source/blender/blenfont/intern/blf_glyph.c
source/blender/editors/interface/interface_style.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/python/generic/blf_py_api.c
source/blender/windowmanager/intern/wm_files.c