Merged master@e12c3110024dc4b62ffefa739288218b04e39f71 into blender2.8
authorSybren A. Stüvel <sybren@stuvel.eu>
Tue, 18 Apr 2017 12:18:06 +0000 (14:18 +0200)
committerSybren A. Stüvel <sybren@stuvel.eu>
Tue, 18 Apr 2017 12:18:06 +0000 (14:18 +0200)
This doesn't merge entire master into blender2.8, but at least solves
one conflict.

1  2 
tests/python/CMakeLists.txt

index cd1ce1ea47d3b1be7e07a2e29f93634a59f8739d,8ff2f77c38e5c47320a18d067b39aeb5d44afa68..71e4b970091963a37f38bcef9af2edbb64b0ed59
@@@ -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)