Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 14 Mar 2017 19:04:52 +0000 (06:04 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 14 Mar 2017 19:04:52 +0000 (06:04 +1100)
commit1d5ba269c1f6b232f1ec83e77e6e8fe07d5c5d1f
tree327dc2edb006468113e185b4946ab4c3b434d68b
parent0f13f5a683ec9b8d024feaec5ba2ede193a618f0
parentf13c729b26befae8709a8e565a27d6fd31101d44
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/mesh.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_view3d/drawarmature.c
source/blender/editors/util/undo.c
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_event_system.c
source/blender/windowmanager/intern/wm_files.c