From 6dd047c333081e45a99119daaf2e9965471e05e2 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@gmail.com>
Date: Fri, 28 Sep 2018 14:09:42 +0200
Subject: [PATCH 1/2] Tests: recurse into directories for finding OpenGL draw
 test .blends.

---
 tests/python/CMakeLists.txt           | 2 +-
 tests/python/modules/render_report.py | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt
index 0a6e2e4909c..b5cc39ae37a 100644
--- a/tests/python/CMakeLists.txt
+++ b/tests/python/CMakeLists.txt
@@ -575,7 +575,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 6c71e8dcb74..ebfc58997c0 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):

From de3ee3c6e842692a32182f3349bc1c76cde14683 Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey.vfx@gmail.com>
Date: Fri, 28 Sep 2018 15:02:20 +0200
Subject: [PATCH 2/2] Cycles: Fix compilation error of CUDA kernel

Was caused by previous commit.
---
 intern/cycles/kernel/bvh/bvh.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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. */