[Bf-blender-cvs] [c0b9b6d] cycles_split_kernel: Cycles: Add missing check for split kernel build error
Mai Lavelle
noreply at git.blender.org
Tue Oct 25 11:13:21 CEST 2016
Commit: c0b9b6dc549a5c562e7e531df907005d41e66f15
Author: Mai Lavelle
Date: Tue Oct 25 11:10:24 2016 +0200
Branches: cycles_split_kernel
https://developer.blender.org/rBc0b9b6dc549a5c562e7e531df907005d41e66f15
Cycles: Add missing check for split kernel build error
===================================================================
M intern/cycles/device/opencl/opencl_base.cpp
===================================================================
diff --git a/intern/cycles/device/opencl/opencl_base.cpp b/intern/cycles/device/opencl/opencl_base.cpp
index a2b9003..8350f2f 100644
--- a/intern/cycles/device/opencl/opencl_base.cpp
+++ b/intern/cycles/device/opencl/opencl_base.cpp
@@ -210,7 +210,9 @@ bool OpenCLDeviceBase::load_kernels(const DeviceRequestedFeatures& requested_fea
vector<OpenCLProgram*> programs;
programs.push_back(&base_program);
/* Call actual class to fill the vector with its programs. */
- load_kernels(requested_features, programs);
+ if(!load_kernels(requested_features, programs)) {
+ return false;
+ }
/* Parallel compilation is supported by Cycles, but currently all OpenCL frameworks
* serialize the calls internally, so it's not much use right now.
More information about the Bf-blender-cvs
mailing list