Sybren A. Stüvel d4913af846 Merge branch 'master' into blender2.8 ...

# Conflicts:
#	source/blender/blenloader/intern/writefile.c

2017-02-08 13:10:16 +01:00

..

intern

Merge branch 'master' into blender2.8

2017-02-08 13:10:16 +01:00

ABC_alembic.h

Alembic: store a pointer to the object reader in the cache modifiers and

2016-10-29 12:23:09 +02:00

CMakeLists.txt

Alembic: fix compile error on Linux.

2017-01-26 06:18:07 +01:00