Merge branch 'master' into blender2.8
authorJulian Eisel <eiseljulian@gmail.com>
Fri, 5 May 2017 10:44:52 +0000 (12:44 +0200)
committerJulian Eisel <eiseljulian@gmail.com>
Fri, 5 May 2017 10:44:52 +0000 (12:44 +0200)
commit8b8792e7b8aa04c33d2b57c79a6d24bf03b699fb
tree575027326d925d9e2028ce7c24f384d48a0bd067
parenta7388d650a8b0045aee680ca38cc02fc021ebbc3
parent5b6838129f022102518b7cd8cabec3823c3749a8
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/armature.c
source/blender/blenkernel/intern/library.c
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_intern.h
source/blender/editors/interface/interface_regions.c
source/blender/editors/interface/interface_templates.c
source/blender/modifiers/intern/MOD_warp.c