Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 2 Mar 2018 03:46:21 +0000 (14:46 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 2 Mar 2018 03:46:21 +0000 (14:46 +1100)
commitda2d0fe43af030b5fe6e11226e7e691242f001aa
tree2f701d643bad9a51616a1a47d96a3d36acc43c26
parent4913e47aa0107cbe1daf06e8020a60916ea883a3
parentff74357da09d5060d61d247f75dbb01e91ca3bb9
Merge branch 'master' into blender2.8
source/blender/editors/animation/keyframing.c
source/blender/editors/armature/pose_edit.c
source/blender/editors/include/ED_object.h
source/blender/editors/object/CMakeLists.txt
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_modes.c
source/blender/editors/util/ed_util.c