Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 19 Mar 2018 17:06:27 +0000 (18:06 +0100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 19 Mar 2018 17:14:05 +0000 (18:14 +0100)
commit5e81d993afadc6b5d37410e91998395caf1d1281
treeec57394bb9e74110a21b086678535e17c65524db
parentb5bf3011bf3851d1e68dbcdde310fff04dc3f2f5
parenta3486e735f7e5af6ca78dafc8608cced5a121096
Merge branch 'master' into blender2.8
28 files changed:
build_files/cmake/macros.cmake
doc/doxygen/doxygen.source.h
source/blender/blenkernel/CMakeLists.txt
source/blender/editors/CMakeLists.txt
source/blender/editors/armature/CMakeLists.txt
source/blender/editors/armature/armature_utils.c
source/blender/editors/curve/CMakeLists.txt
source/blender/editors/curve/editcurve.c
source/blender/editors/include/ED_armature.h
source/blender/editors/include/ED_object.h
source/blender/editors/lattice/CMakeLists.txt
source/blender/editors/lattice/editlattice_tools.c
source/blender/editors/metaball/CMakeLists.txt
source/blender/editors/metaball/mball_edit.c
source/blender/editors/object/CMakeLists.txt
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_intern.h
source/blender/editors/object/object_ops.c
source/blender/editors/physics/CMakeLists.txt
source/blender/editors/physics/particle_edit.c
source/blender/editors/physics/particle_edit_undo.c
source/blender/editors/physics/particle_object.c
source/blender/editors/physics/physics_intern.h
source/blender/editors/space_api/spacetypes.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/util/undo.c
source/blender/makesrna/intern/rna_object.c
source/blenderplayer/bad_level_call_stubs/stubs.c