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
2017-04-10 14:53:32 +02:00
2013-12-24 22:57:27 +06:00
2010-10-13 14:44:22 +00:00
2017-02-20 10:16:58 +01:00
Description
No description provided
841 MiB
Languages
C++ 78%
Python 14.9%
C 2.9%
GLSL 1.9%
CMake 1.2%
Other 0.9%