Merge branch 'master' into blender2.8
authorLuca Rood <dev@lucarood.com>
Wed, 5 Jul 2017 13:50:01 +0000 (15:50 +0200)
committerLuca Rood <dev@lucarood.com>
Wed, 5 Jul 2017 13:50:01 +0000 (15:50 +0200)
commitbdeeb29482af2ab44e03e4681eb079bdcff82b21
tree1bd0efa9a5e81fd93ef8af737605eb383fb6bf5d
parentf3764d51bd79a5b1eb7ea512817820da9d5150c5
parentfed853ea782211298c902759ec8cd8e455d8b41d
Merge branch 'master' into blender2.8
intern/cycles/device/device_cuda.cpp
source/blender/blenkernel/intern/particle.c
source/blender/makesrna/intern/rna_particle.c