diff options
| -rw-r--r-- | intern/cycles/kernel/bvh/bvh.h | 2 | ||||
| -rw-r--r-- | tests/python/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | tests/python/modules/render_report.py | 9 |
3 files changed, 7 insertions, 6 deletions
diff --git a/intern/cycles/kernel/bvh/bvh.h b/intern/cycles/kernel/bvh/bvh.h index b3135573878..d11d999134c 100644 --- a/intern/cycles/kernel/bvh/bvh.h +++ b/intern/cycles/kernel/bvh/bvh.h @@ -170,7 +170,7 @@ ccl_device_inline bool scene_intersect_valid(const Ray *ray) * From production scenes so far it seems it's enough to test first element * only. */ - return finite(ray->P.x); + return isfinite(ray->P.x); } /* Note: ray is passed by value to work around a possible CUDA compiler bug. */ diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt index d5ba68b9b93..9faedf93d62 100644 --- a/tests/python/CMakeLists.txt +++ b/tests/python/CMakeLists.txt @@ -583,7 +583,7 @@ if(WITH_OPENGL_DRAW_TESTS) file(GLOB children RELATIVE ${TEST_SRC_DIR} ${TEST_SRC_DIR}/*) foreach(child ${children}) if(IS_DIRECTORY ${TEST_SRC_DIR}/${child}) - file(GLOB blends ${TEST_SRC_DIR}/${child}/*.blend) + file(GLOB_RECURSE blends "${TEST_SRC_DIR}/${child}/*.blend") if(blends) add_python_test( opengl_draw_${child}_test diff --git a/tests/python/modules/render_report.py b/tests/python/modules/render_report.py index 1f0022f13b6..8deed25e854 100755 --- a/tests/python/modules/render_report.py +++ b/tests/python/modules/render_report.py @@ -51,10 +51,11 @@ def print_message(message, type=None, status=''): def blend_list(dirpath): - for filename in os.listdir(dirpath): - if filename.lower().endswith(".blend"): - filepath = os.path.join(dirpath, filename) - yield filepath + for root, dirs, files in os.walk(dirpath): + for filename in files: + if filename.lower().endswith(".blend"): + filepath = os.path.join(root, filename) + yield filepath def test_get_name(filepath): |