Bastien Montagne 95b3632112 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/alembic/intern/abc_exporter.cc

2017-04-14 12:39:54 +02:00

..

intern

Merge branch 'master' into blender2.8

2017-04-14 12:39:54 +02:00

CMakeLists.txt

Merge branch 'master' into blender2.8

2017-02-27 16:08:25 -03:00

MOD_modifiertypes.h

Surface Deform Modifier (SDef)

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