Merge branch 'blender2.7'

intern/cycles/device/opencl/opencl_split.cpp

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

tests/python/CMakeLists.txt

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