Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 31 May 2018 14:57:39 +0000 (16:57 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 31 May 2018 14:57:39 +0000 (16:57 +0200)
commit5a82aee9e69ddcfbd4ca704f6566cf7eeec97dec
tree91900e6023b47092dfc28236e0425c28f287b7c5
parent8d53e8cd029dbec02ba9aea1975d6ff780b161df
parentda11e33b26b6579ef36c97de1b6fbc0eb02a0b69
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
source/blender/alembic/intern/abc_mball.h