Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 21 Aug 2018 17:08:23 +0000 (19:08 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 21 Aug 2018 17:08:23 +0000 (19:08 +0200)
commit596c3368f4b09bdeec46e7b44abfc8bcb7ba8fcf
tree09a8d4af2f134db67579577d38ad78fa667afede
parent794836c8f17a2feaa43d31d23982fa41e3f953a4
parent34029fc71a3cc7e69f977462d4b3f09eb10ccca2
Merge branch 'master' into blender2.8
release/scripts/startup/bl_ui/space_userpref.py
source/blender/blenfont/BLF_api.h
source/blender/blenfont/intern/blf_glyph.c
source/blender/editors/interface/interface_style.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_userdef.c