Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 18 Apr 2018 11:55:09 +0000 (13:55 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 18 Apr 2018 11:55:09 +0000 (13:55 +0200)
commitc67a2bd5ba8444e8d27c1440b13cc540898a217c
tree94f6370e010494b9958c19aa3ef156941e72fd8a
parent9b338e802805bb7dbf981512923d6a1f343fbaa8
parentf28aec17e9d6b955f776a5fb83ef67786a07bb6a
Merge branch 'master' into blender2.8
source/blender/modifiers/intern/MOD_particleinstance.c