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)
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

1  2 
source/blender/alembic/intern/abc_mball.h