Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 15 May 2018 08:25:49 +0000 (10:25 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 15 May 2018 08:25:49 +0000 (10:25 +0200)
commitf1bc8991461fcda33eb34820bd3aa153f6122c5b
treef6e2c533feeff8a9cf0ff36aef8035e95a5e0f0b
parent55b241d32a2c3192a439c51aff99a0a248ca9ef2
parent9636cab0098f96b9c6b6493fb7120f32d7506cd6
Merge branch 'master' into blender2.8
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/curve/editcurve_add.c
source/blender/editors/include/ED_object.h
source/blender/editors/mesh/editmesh_add.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_modes.c
source/blender/editors/space_outliner/outliner_select.c
source/blender/editors/space_outliner/outliner_tools.c