Merge branch 'master' into blender2.8

Conflicts: source/blender/editors/animation/anim_draw.c
2017-02-17 20:03:55 +01:00
parent cb36dbe606 6f1493f68f
commit 322b1d3187
66 changed files with 1626 additions and 1557 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -447,6 +447,7 @@ option(WITH_BOOST					"Enable features depending on boost" ON)

 # Unit testsing
 option(WITH_GTESTS "Enable GTest unit testing" OFF)
+option(WITH_OPENGL_TESTS "Enable OpenGL related unit testing (Experimental)" OFF)


 # Documentation