Merge branch 'blender-v2.93-release'

2021-05-18 15:43:06 +02:00
parent 2b660e825b a9da73ab95
commit 7aa7cc4ca1
3 changed files with 18 additions and 14 deletions
--- a/tests/python/CMakeLists.txt
+++ b/tests/python/CMakeLists.txt
@@ -240,17 +240,14 @@ add_blender_test(
  --run-all-tests
 )

-# disabled on macOS arm64 until updated & working
-if(NOT (APPLE AND ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")))
-  if(WITH_MOD_OCEANSIM)
-    add_blender_test(
-      physics_ocean
-      ${TEST_SRC_DIR}/physics/ocean_test.blend
-      --python ${TEST_PYTHON_DIR}/physics_ocean.py
-      --
-      --run-all-tests
-    )
-  endif()
+if(WITH_MOD_OCEANSIM)
+  add_blender_test(
+    physics_ocean
+    ${TEST_SRC_DIR}/physics/ocean_test.blend
+    --python ${TEST_PYTHON_DIR}/physics_ocean.py
+    --
+    --run-all-tests
+  )
 endif()