Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 31 May 2018 13:37:15 +0000 (15:37 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 31 May 2018 13:37:15 +0000 (15:37 +0200)
commitb809340960693a3e9808e59de4d1e029226fb492
treea2f75c291b8ac4d3ffa4abdb3b9fe013f1506dc4
parent3248ac5e83307d623b18ccaed4c0b496121802e5
parentb53d358261a26652d510d62565f1b43035a55e67
Merge branch 'master' into blender2.8

Conflicts:
intern/cycles/blender/blender_curves.cpp
source/blender/blenkernel/BKE_particle.h
source/blender/blenkernel/intern/modifier.c
source/blender/blenkernel/intern/object_update.c
source/blender/blenkernel/intern/particle_system.c
source/blender/editors/object/object_modifier.c
source/blender/editors/physics/physics_fluid.c
source/blender/makesrna/intern/rna_particle.c
source/blender/modifiers/intern/MOD_particlesystem.c
source/blender/blenkernel/BKE_modifier.h
source/blender/blenkernel/intern/modifier.c
source/blender/blenkernel/intern/particle_system.c
source/blender/editors/object/object_modifier.c
source/blender/editors/physics/physics_fluid.c
source/blender/makesrna/intern/rna_fluidsim.c
source/blender/modifiers/intern/MOD_fluidsim_util.c
source/blender/modifiers/intern/MOD_ocean.c