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

Disabled a unittest, to be re-enabled when T51261 is fixed.

# Conflicts:
#	source/blender/alembic/intern/alembic_capi.cc

2017-04-20 12:50:20 +02:00

..

gtests

Fix building alembic gtest with buildinfo...

2017-04-07 10:44:13 +02:00

python

Merge branch 'master' into blender2.8

2017-04-20 12:50:20 +02:00

check_deprecated.py

Remove SCons building system

2016-01-04 14:20:48 +05:00

CMakeLists.txt

…