Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 11 Apr 2018 07:41:49 +0000 (09:41 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 11 Apr 2018 07:41:49 +0000 (09:41 +0200)
commitce3adc090d6cb380e345b0112079b01a61aa3544
tree807962bc12d15111c976a655de9c2b64aec0c7b3
parenta3a76bc0fed3efa9d30ac5d0647a5449b7dcc38a
parentc963488b5e25b906ff72cbaabdcc76cbfbc77172
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