Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 7 Jul 2017 23:02:11 +0000 (01:02 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 7 Jul 2017 23:02:11 +0000 (01:02 +0200)
commitdb28e2deb9d154ed50600542e37828867d0148e5
tree279612479f5a0052d4a189af6e36b3dbff1e231c
parente960cecdf8d1cef32f8c42e633ad05a08a97972b
parent7dc3ad22873e08de11172757066bb2b3a27f7203
Merge branch 'master' into blender2.8
12 files changed:
source/blender/blenfont/BLF_api.h
source/blender/blenfont/intern/blf.c
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/blender.c
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/editors/screen/screen_edit.c
source/blender/render/intern/source/convertblender.c
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_init_exit.c
source/blender/windowmanager/intern/wm_window.c
source/gameengine/GamePlayer/ghost/GPG_ghost.cpp