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

Campbell Barton noreply at git.blender.org
Mon Jun 5 10:25:32 CEST 2017


Commit: e83001b782f9a3cdd33a4cf57777ee7f2967dc2c
Author: Campbell Barton
Date:   Mon Jun 5 18:11:59 2017 +1000
Branches: blender2.8
https://developer.blender.org/rBe83001b782f9a3cdd33a4cf57777ee7f2967dc2c

Merge branch 'master' into blender2.8

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



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

diff --cc tests/python/CMakeLists.txt
index 65e348336b4,d3067a22ee7..986a09b8f79
--- a/tests/python/CMakeLists.txt
+++ b/tests/python/CMakeLists.txt
@@@ -480,7 -483,11 +483,13 @@@ if(WITH_ALEMBIC
  			--testdir "${TEST_SRC_DIR}/alembic"
  			--alembic-root "${ALEMBIC_ROOT_DIR}"
  		)
+ 		add_test(script_alembic_import ${TEST_BLENDER_EXE}
+ 		--python ${CMAKE_CURRENT_LIST_DIR}/bl_alembic_import_test.py
+ 		--
+ 		--testdir "${TEST_SRC_DIR}/alembic"
+ 		)
+ 
  	endif()
  endif()
 +
 +add_subdirectory(render_layer)




More information about the Bf-blender-cvs mailing list