Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 11 Apr 2018 07:02:32 +0000 (09:02 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 11 Apr 2018 07:02:32 +0000 (09:02 +0200)
commitdebe3011f62e5935dc54d7033052d7d4e24ad449
tree4858e23ac7e2a49441e76e4ce6eddc2f74e766b7
parent1b78f05b1ca466695b39d4fd60570790c1ab9e13
parent32339a56f11ac1392c4b8d8651ff452a2a5511cc
Merge branch 'master' into blender2.8
source/blender/editors/armature/pose_edit.c
source/blender/editors/include/ED_armature.h
source/blender/editors/object/object_edit.c
source/blender/editors/space_outliner/outliner_select.c