[Bf-blender-cvs] [60d8ced] cycles_split_kernel: Merge branch 'master' into cycles_split_kernel

[Mai Lavelle]

Commit: 60d8ced602c47d30a83c745f81399904a471fa36
Author: Mai Lavelle
Date:   Wed Dec 7 05:23:22 2016 -0500
Branches: cycles_split_kernel
https://developer.blender.org/rB60d8ced602c47d30a83c745f81399904a471fa36

Merge branch 'master' into cycles_split_kernel

===================================================================



===================================================================

diff --cc intern/cycles/device/opencl/opencl.h
index e5a5014,4023ba8..d42de47
--- a/intern/cycles/device/opencl/opencl.h
+++ b/intern/cycles/device/opencl/opencl.h
@@@ -16,10 -16,7 +16,8 @@@
  
  #ifdef WITH_OPENCL
  
- #include "clew.h"
- 
  #include "device.h"
 +#include "device_split_kernel.h"
  
  #include "util_map.h"
  #include "util_param.h"
diff --cc intern/cycles/device/opencl/opencl_mega.cpp
index 65feba8,6ea7619..049e332
--- a/intern/cycles/device/opencl/opencl_mega.cpp
+++ b/intern/cycles/device/opencl/opencl_mega.cpp
@@@ -39,7 -39,11 +39,11 @@@ public
  	{
  	}
  
+ 	virtual bool show_samples() const {
+ 		return true;
+ 	}
+ 
 -	virtual void load_kernels(const DeviceRequestedFeatures& /*requested_features*/,
 +	virtual bool load_kernels(const DeviceRequestedFeatures& /*requested_features*/,
  	                          vector<OpenCLProgram*> &programs)
  	{
  		path_trace_program.add_kernel(ustring("path_trace"));