Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 16 Apr 2018 16:22:43 +0000 (18:22 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 16 Apr 2018 16:22:43 +0000 (18:22 +0200)
commit49ee1a97d2704d8cc707201675a919b9ef103fec
tree17c78db252f4b24297490de623fe5f303cea181a
parent292a2802ad376f4a3a2cc7bed763d0f5856dd98c
parenteb6fe5fa94b86a0a20742e06bf1e68b4cbaf6693
Merge branch 'master' into blender2.8
source/blender/alembic/intern/abc_hair.cc
source/blender/alembic/intern/abc_object.cc
source/blender/blenkernel/intern/cloth.c
source/blender/blenkernel/intern/particle_distribute.c
source/blender/blenkernel/intern/softbody.c
source/blender/collada/AnimationImporter.cpp
source/blender/collada/EffectExporter.cpp
source/blender/editors/physics/particle_object.c