Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 16 Apr 2018 05:27:53 +0000 (07:27 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 16 Apr 2018 05:27:53 +0000 (07:27 +0200)
commit55939bf21936c6bef5c350fbf679c08a7c57ea88
tree0749c2e1d69a918266e842155203e607fd5d86af
parent61a22262d19e21d457b7a06166c207d2cba717a2
parent80f7249d09a76b7e045525fa8f78c7d660a8749d
Merge branch 'master' into blender2.8
source/blender/editors/armature/armature_edit.c
source/blender/editors/space_view3d/view3d_select.c