Bastien Montagne 322b1d3187 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/editors/animation/anim_draw.c

2017-02-17 20:03:55 +01:00

..

gtests

Tests: Use proper order for EXPECT_EQ()

2017-02-03 12:03:59 +01:00

python

Merge branch 'master' into blender2.8

2017-02-17 20:03:55 +01:00

check_deprecated.py

Remove SCons building system

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

CMakeLists.txt

…