Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender2.7'

Browse Source
This commit is contained in:
Brecht Van Lommel
2019-02-20 19:07:25 +01:00
parent 5df82b60d1 848f589fdf
commit 9a9336cb45
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
intern/cycles/device/opencl/opencl_split.cpp
View File

@@ -486,7 +486,6 @@ OpenCLDevice::OpenCLDevice(DeviceInfo& info, Stats &stats, Profiler &profiler, b
device_initialized = true; device_initialized = true;
split_kernel = new OpenCLSplitKernel(this); split_kernel = new OpenCLSplitKernel(this);
background = background;
} }
OpenCLDevice::~OpenCLDevice() OpenCLDevice::~OpenCLDevice()

12
tests/python/CMakeLists.txt
View File

@@ -577,17 +577,19 @@ endif()
if(WITH_OPENGL_DRAW_TESTS) if(WITH_OPENGL_DRAW_TESTS)
if(OPENIMAGEIO_IDIFF AND EXISTS "${TEST_SRC_DIR}/opengl") if(OPENIMAGEIO_IDIFF AND EXISTS "${TEST_SRC_DIR}/opengl")
# Use all test folders # Use all subdirectories of opengl folder.
file(GLOB children RELATIVE ${TEST_SRC_DIR} ${TEST_SRC_DIR}/*) file(GLOB children RELATIVE ${TEST_SRC_DIR}/opengl ${TEST_SRC_DIR}/opengl/*)
foreach(child ${children}) foreach(child ${children})
if(IS_DIRECTORY ${TEST_SRC_DIR}/${child}) # Resolve symlinks, useful to test production files with linked libraries.
file(GLOB_RECURSE blends "${TEST_SRC_DIR}/${child}/*.blend") get_filename_component(child_path ${TEST_SRC_DIR}/opengl/${child} REALPATH)
if(IS_DIRECTORY ${child_path})
file(GLOB_RECURSE blends "${child_path}/*.blend")
if(blends) if(blends)
add_python_test( add_python_test(
opengl_draw_${child}_test opengl_draw_${child}_test
${CMAKE_CURRENT_LIST_DIR}/opengl_draw_tests.py ${CMAKE_CURRENT_LIST_DIR}/opengl_draw_tests.py
-blender "$<TARGET_FILE:blender>" -blender "$<TARGET_FILE:blender>"
-testdir "${TEST_SRC_DIR}/${child}" -testdir "${child_path}"
-idiff "${OPENIMAGEIO_IDIFF}" -idiff "${OPENIMAGEIO_IDIFF}"
-outdir "${TEST_OUT_DIR}/opengl_draw" -outdir "${TEST_OUT_DIR}/opengl_draw"
) )