Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 26 Mar 2018 12:56:00 +0000 (14:56 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 26 Mar 2018 12:56:00 +0000 (14:56 +0200)
commit21aca14e43326ea9af45f1e848ebca52808f8470
tree25c5838a8b40ecb5996c7f1ccdfc1a90f69bd23b
parent13f80a152a3a84286330b1bc6d9818279b976e91
parent3c45fdd171fa6ebd65f19f9fac9b204865e13136
Merge branch 'master' into blender2.8
12 files changed:
intern/ghost/test/CMakeLists.txt
source/blender/blenfont/BLF_api.h
source/blender/blenfont/intern/blf.c
source/blender/blenfont/intern/blf_glyph.c
source/blender/blenkernel/intern/text.c
source/blender/depsgraph/util/deg_util_function.h
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_layout.c
source/blender/editors/space_text/text_ops.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_operators.c