diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2018-02-08 21:00:20 +0300 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2018-02-08 21:00:20 +0300 |
| commit | 3b61d2bb68d96c15e9d00fecea17e0794f613a78 (patch) | |
| tree | e6c3af4361a8825b4219a1965c1dc2f327a1b4b9 /tests | |
| parent | 74fa84f37f718939474334abe975797462ec8e29 (diff) | |
| parent | 859379ac487509f3eed96de5c78f934fbd3490d2 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
intern/cycles/blender/addon/ui.py
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/python/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt index 9f1de64c2e9..537a3e3a07e 100644 --- a/tests/python/CMakeLists.txt +++ b/tests/python/CMakeLists.txt @@ -547,6 +547,7 @@ if(WITH_CYCLES) add_cycles_render_test(shader) add_cycles_render_test(shader_tangent) add_cycles_render_test(shadow_catcher) + add_cycles_render_test(sss) add_cycles_render_test(texture_space) add_cycles_render_test(volume) else() |