Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Tue, 12 Jun 2018 10:58:31 +0000 (12:58 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Tue, 12 Jun 2018 10:58:31 +0000 (12:58 +0200)
commit43eebdfebd6e31d188ae3c1b220c8991fc869df3
tree5adc929ce792f2dfd74276838e63d91fcddb9a1c
parentc98b2e74df2e531726f5ceabe76342282f695f23
parentbe57cf9b2a0e1be577211839487cacd288886c1a
Merge branch 'master' into blender2.8

Conflicts:
source/blender/collada/DocumentImporter.cpp
source/blender/editors/include/ED_object.h
source/blender/editors/object/object_modifier.c
source/blender/blenkernel/BKE_object.h
source/blender/blenkernel/intern/object.c
source/blender/collada/ArmatureImporter.cpp
source/blender/collada/ArmatureImporter.h
source/blender/collada/DocumentImporter.cpp
source/blender/editors/include/ED_object.h
source/blender/editors/mesh/meshtools.c
source/blender/editors/object/object_modifier.c
source/blender/editors/object/object_shapekey.c
source/blender/makesrna/intern/rna_object_api.c