Bastien Montagne b809340960 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

2018-05-31 15:37:15 +02:00

..

intern

Merge branch 'master' into blender2.8

2018-05-31 15:37:15 +02:00

CMakeLists.txt

Surface Deform mod: removed some stuff that shouldn't have been committed

2018-05-09 12:41:32 +02:00

MOD_modifiertypes.h

Surface Deform Modifier (SDef)

2017-02-27 13:49:14 -03:00