Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 3 Aug 2017 22:26:05 +0000 (08:26 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 3 Aug 2017 22:26:05 +0000 (08:26 +1000)
1  2 
tests/python/CMakeLists.txt

index 20fa8257a32b072f739befca65ddbd6b4b4c5283,f2fea48d9f4699530bdad2d576a522e2da8ff9a9..28ce095b0e81c42795eee09de679c05e9c5726db
@@@ -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)