Merge branch 'master' into blender2.8
This commit is contained in:
commit
d2d0b4fcd7
|
@ -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. */
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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):
|
||||
|
|
Loading…
Reference in New Issue