Merge branch 'master' into blender2.8
[blender.git] / intern / cycles / device / device_cuda.cpp
index 830cc207d54b9574991e23d47d235f0788e9e10a..2af8a9f48c87f06b3b08e941ffa26c6ea94e9840 100644 (file)
@@ -1667,7 +1667,7 @@ public:
                for(int sample = start_sample; sample < end_sample; sample += step_samples) {
                        /* Setup and copy work tile to device. */
                        wtile->start_sample = sample;
                for(int sample = start_sample; sample < end_sample; sample += step_samples) {
                        /* Setup and copy work tile to device. */
                        wtile->start_sample = sample;
-                       wtile->num_samples = min(step_samples, end_sample - sample);;
+                       wtile->num_samples = min(step_samples, end_sample - sample);
                        work_tiles.copy_to_device();
 
                        CUdeviceptr d_work_tiles = cuda_device_ptr(work_tiles.device_pointer);
                        work_tiles.copy_to_device();
 
                        CUdeviceptr d_work_tiles = cuda_device_ptr(work_tiles.device_pointer);