diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-02-17 22:03:55 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-02-17 22:03:55 +0300 |
| commit | 322b1d3187fc5b3e82ebf8b13a675e3132059ef4 (patch) | |
| tree | 50a7091fc310cd503e3878a9b9f7a4734f9fcdc7 /tests/python/CMakeLists.txt | |
| parent | cb36dbe606d9e5bef32a756a60b1d77a92dccfa8 (diff) | |
| parent | 6f1493f68fe01a8e951cf6c4e50103e20b85d513 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/animation/anim_draw.c
Diffstat (limited to 'tests/python/CMakeLists.txt')
| -rw-r--r-- | tests/python/CMakeLists.txt | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt index 3e383614dc0..faa31669f81 100644 --- a/tests/python/CMakeLists.txt +++ b/tests/python/CMakeLists.txt @@ -95,6 +95,11 @@ add_test(bevel ${TEST_BLENDER_EXE} --python-text run_tests ) +add_test(split_faces ${TEST_BLENDER_EXE} + ${TEST_SRC_DIR}/modeling/split_faces_test.blend + --python-text run_tests +) + # ------------------------------------------------------------------------------ # IO TESTS @@ -417,7 +422,12 @@ if(WITH_CYCLES) -idiff "${OPENIMAGEIO_IDIFF}" ) endif() - endmacro() + endmacro() + if(WITH_OPENGL_TESTS) + add_cycles_render_test(opengl) + endif() + add_cycles_render_test(image) + add_cycles_render_test(mblur) add_cycles_render_test(reports) add_cycles_render_test(render) add_cycles_render_test(shader) |