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

# Conflicts:
#	source/blender/makesrna/intern/rna_render.c

2017-08-15 13:02:45 +02:00

..

intern

Merge branch 'master' into blender2.8

2017-08-15 13:02:45 +02:00

ABC_alembic.h

Alembic: simplified sub-frame sampling

2017-05-30 13:47:51 +02:00

CMakeLists.txt

Depsgraph: Remove old depsgraph header from alembic files

2017-04-06 15:49:56 +02:00