Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 26 Sep 2017 14:24:10 +0000 (00:24 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 26 Sep 2017 14:24:10 +0000 (00:24 +1000)
commit772944a6b47f1bb1bcefc7eb220bee5924c4e4d9
treea08cac00f66e2dc21e58b213c380ab76f23b8368
parent51c87bbad0b70f33c96955256c7935f124d00382
parent870dfb1b5aac1c5c4dbcce0f8318c11d229bf3ac
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/particle_system.c
source/blender/blenloader/intern/versioning_legacy.c
source/blender/collada/AnimationExporter.cpp
source/blender/collada/DocumentImporter.cpp
source/blender/collada/GeometryExporter.cpp