Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 14 Dec 2017 01:51:26 +0000 (12:51 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 14 Dec 2017 01:51:26 +0000 (12:51 +1100)
commitb83b6afe5572ae29b4ad105dd8001c3343e2205b
tree1c541c9f9eda1cce71c11d5408046099b2207ce8
parentf59728b3ea0b1782b8d62fefd0a0bc27b70da51a
parent99b7dc60bef5ff8680889ae8bcca1a8b14023402
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/particle.c
source/blender/collada/GeometryExporter.cpp