[Bf-blender-cvs] [5a82aee9e69] blender2.8: Merge branch 'master' into blender2.8

[Bastien Montagne]

Commit: 5a82aee9e69ddcfbd4ca704f6566cf7eeec97dec
Author: Bastien Montagne
Date:   Thu May 31 16:57:39 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB5a82aee9e69ddcfbd4ca704f6566cf7eeec97dec

Merge branch 'master' into blender2.8

Conflicts:
	source/blender/alembic/intern/abc_exporter.cc
	source/blender/blenkernel/BKE_mball.h
	source/blender/blenkernel/intern/depsgraph.c
	source/blender/blenkernel/intern/mball.c
	source/blender/editors/object/object_add.c
	source/blender/render/intern/source/convertblender.c

===================================================================



===================================================================