Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 14 Feb 2018 05:04:07 +0000 (16:04 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 14 Feb 2018 05:04:07 +0000 (16:04 +1100)
1  2 
tests/python/CMakeLists.txt

index dff7c352a32960974506c5553e5daa9f46151729,662a35558b7e09fb529ef3e1b958b7b6c73c726c..79031824b833d990cedcb25c7ed0b8ffa5a34904
@@@ -116,21 -116,21 +116,21 @@@ add_test
  # ------------------------------------------------------------------------------
  # MODELING TESTS
  add_test(
-       NAME bevel
+       NAME bmesh_bevel
        COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
        ${TEST_SRC_DIR}/modeling/bevel_regression.blend
        --python-text run_tests
  )
  
  add_test(
-       NAME boolean
+       NAME bmesh_boolean
        COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
        ${TEST_SRC_DIR}/modeling/bool_regression.blend
        --python-text run_tests
  )
  
  add_test(
-       NAME split_faces
+       NAME bmesh_split_faces
        COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
        ${TEST_SRC_DIR}/modeling/split_faces_test.blend
        --python-text run_tests
  # ------------------------------------------------------------------------------
  # MODIFIERS TESTS
  add_test(
-       NAME modifier_array
+       NAME object_modifier_array
        COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
        ${TEST_SRC_DIR}/modifier_stack/array_test.blend
        --python-text run_tests
@@@ -600,5 -600,3 +600,5 @@@ if(WITH_ALEMBIC
                --with-legacy-depsgraph=${WITH_LEGACY_DEPSGRAPH}
        )
  endif()
 +
 +add_subdirectory(view_layer)