[Bf-blender-cvs] [c3ab5b3] master: Fix T44830, wrong sample progress number when using split device.

[Thomas Dinges]

Commit: c3ab5b3089ef79ea345a5bc836346f685aecf29c
Author: Thomas Dinges
Date:   Mon May 25 00:37:01 2015 +0200
Branches: master
https://developer.blender.org/rBc3ab5b3089ef79ea345a5bc836346f685aecf29c

Fix T44830, wrong sample progress number when using split device.

Value was not set, moved it out of the constructor into
device_opencl_create() now.

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

M	intern/cycles/device/device_opencl.cpp

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

diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp
index d209340..2f9f9af 100644
--- a/intern/cycles/device/device_opencl.cpp
+++ b/intern/cycles/device/device_opencl.cpp
@@ -1675,8 +1675,6 @@ public:
 	OpenCLDeviceSplitKernel(DeviceInfo& info, Stats &stats, bool background_)
 	: OpenCLDeviceBase(info, stats, background_)
 	{
-
-		info.use_split_kernel = true;
 		background = background_;
 
 		/* Initialize kernels. */
@@ -3327,6 +3325,7 @@ Device *device_opencl_create(DeviceInfo& info, Stats &stats, bool background)
 		{
 			/* If the device is an AMD GPU, take split kernel path. */
 			VLOG(1) << "Using split kernel";
+			info.use_split_kernel = true;
 			return new OpenCLDeviceSplitKernel(info, stats, background);
 		} else {
 			/* For any other device, take megakernel path. */