Bastien Montagne 160e62b88c Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenkernel/BKE_object.h

2018-04-04 15:03:55 +02:00

..

intern

Merge branch 'master' into blender2.8

2018-04-04 15:03:55 +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