Bastien Montagne 43be434310 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/modifiers/intern/MOD_dynamicpaint.c
	source/blender/modifiers/intern/MOD_uvproject.c

2018-05-08 16:06:32 +02:00

..

intern

Merge branch 'master' into blender2.8

2018-05-08 16:06:32 +02:00

CMakeLists.txt

Merge branch 'master' into blender2.8

2018-02-08 16:27:28 +01:00

MOD_modifiertypes.h

Surface Deform Modifier (SDef)

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