Bastien Montagne 346964eb3f Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/editors/gpencil/drawgpencil.c

2017-04-10 16:53:12 +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-10 16:53:12 +02:00

check_deprecated.py

Remove SCons building system

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

CMakeLists.txt

…