[Bf-blender-cvs] [e16e96433f2] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: e16e96433f21fad3f285008d3a038ca722783ebe
Author: Campbell Barton
Date:   Fri Aug 4 08:26:05 2017 +1000
Branches: blender2.8
https://developer.blender.org/rBe16e96433f21fad3f285008d3a038ca722783ebe

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc tests/python/CMakeLists.txt
index 20fa8257a32,f2fea48d9f4..28ce095b0e8
--- a/tests/python/CMakeLists.txt
+++ b/tests/python/CMakeLists.txt
@@@ -489,9 -578,5 +578,7 @@@ if(WITH_ALEMBIC
  		--
  		--testdir "${TEST_SRC_DIR}/alembic"
  		--with-legacy-depsgraph=${WITH_LEGACY_DEPSGRAPH}
- 		)
- 
- 	endif()
+ 	)
  endif()
 +
 +add_subdirectory(render_layer)