[Bf-blender-cvs] [b27a98df1d9] blender2.8: Merged master at e12c3110024dc4b62ffefa739288218b04e39f71 into blender2.8

[Sybren A. Stüvel]

Commit: b27a98df1d9b8fb0210277d521d11d54d3b83d3a
Author: Sybren A. Stüvel
Date:   Tue Apr 18 14:18:06 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBb27a98df1d9b8fb0210277d521d11d54d3b83d3a

Merged master at e12c3110024dc4b62ffefa739288218b04e39f71 into blender2.8

This doesn't merge entire master into blender2.8, but at least solves
one conflict.

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



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

diff --cc tests/python/CMakeLists.txt
index cd1ce1ea47d,8ff2f77c38e..71e4b970091
--- a/tests/python/CMakeLists.txt
+++ b/tests/python/CMakeLists.txt
@@@ -443,4 -443,22 +443,24 @@@ if(WITH_CYCLES
  	endif()
  endif()
  
+ if(WITH_ALEMBIC)
+ 	if(MSVC)
+ 		add_test(NAME cycles_${subject}_test
+ 			COMMAND
+ 				"$<TARGET_FILE_DIR:blender>/${BLENDER_VERSION_MAJOR}.${BLENDER_VERSION_MINOR}/python/bin/python$<$<CONFIG:Debug>:_d>"
+ 				${CMAKE_CURRENT_LIST_DIR}/alembic_tests.py
+ 			--blender "${TEST_BLENDER_EXE_BARE}"
+ 			--testdir "${TEST_SRC_DIR}/alembic"
+ 			--alembic-root "${ALEMBIC_ROOT_DIR}"
+ 		)
+ 	else()
+ 		add_test(alembic_tests
+ 			${CMAKE_CURRENT_LIST_DIR}/alembic_tests.py
+ 			--blender "${TEST_BLENDER_EXE_BARE}"
+ 			--testdir "${TEST_SRC_DIR}/alembic"
+ 			--alembic-root "${ALEMBIC_ROOT_DIR}"
+ 		)
+ 	endif()
+ endif()
++
 +add_subdirectory(render_layer)