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)
1  2 
intern/cycles/device/device_cuda.cpp
source/blender/blenkernel/intern/particle.c
source/blender/makesrna/intern/rna_particle.c

Simple merge