Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 10 Apr 2018 18:17:56 +0000 (20:17 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 10 Apr 2018 18:17:56 +0000 (20:17 +0200)
commit1b78f05b1ca466695b39d4fd60570790c1ab9e13
tree4c5bff1f5c6da02e87e3eb193190e4a7e5f49e8e
parentd7aa51a50c65d06108a7979265226d1746d89da1
parentf55adabb3e5d3a75ecdb30f90487e314f0afb753
Merge branch 'master' into blender2.8
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/include/ED_object.h
source/blender/editors/object/object_add.c
source/blender/editors/object/object_edit.c
source/blender/editors/space_outliner/outliner_select.c
source/blender/editors/space_outliner/outliner_tools.c