Merge branch 'master' into blender2.8
authorPhilipp Oeser <info@graphics-engineer.com>
Wed, 9 May 2018 12:37:25 +0000 (14:37 +0200)
committerPhilipp Oeser <info@graphics-engineer.com>
Wed, 9 May 2018 12:37:25 +0000 (14:37 +0200)
commit03abe89661e0fe62cb08dd4313949a144386aa4b
tree5dacc624d85314455751262afffa7ef199eefc59
parentb73c7381cc7e359c5baf17748340802e679cf549
parent34c474e695416bd07efae3502101ca549890c7bb
Merge branch 'master' into blender2.8
source/blender/editors/physics/particle_edit.c