Merge branch 'master' into blender2.8

2017-04-24 22:11:05 +10:00
parent f93f4169cb aff30aaf2d
commit 2010dbe8a5
29 changed files with 780 additions and 553 deletions
--- a/tests/python/CMakeLists.txt
+++ b/tests/python/CMakeLists.txt
@@ -458,7 +458,7 @@ if(WITH_ALEMBIC)
 	)

 	if(MSVC)
-		add_test(NAME cycles_${subject}_test
+		add_test(NAME alembic_tests
 			COMMAND
 				"$<TARGET_FILE_DIR:blender>/${BLENDER_VERSION_MAJOR}.${BLENDER_VERSION_MINOR}/python/bin/python$<$<CONFIG:Debug>:_d>"
 				${CMAKE_CURRENT_LIST_DIR}/alembic_tests.py