[Bf-blender-cvs] [6a67f80] soc-2016-cycles_denoising: Cycles: Don't denoise the current tile if the user cancelled the render

Lukas Stockner noreply at git.blender.org
Sun Aug 21 06:18:15 CEST 2016


Commit: 6a67f80a9d3b0146b6a3f4212eae91743b717a09
Author: Lukas Stockner
Date:   Sun Aug 21 04:47:41 2016 +0200
Branches: soc-2016-cycles_denoising
https://developer.blender.org/rB6a67f80a9d3b0146b6a3f4212eae91743b717a09

Cycles: Don't denoise the current tile if the user cancelled the render

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

M	intern/cycles/device/device_cpu.cpp
M	intern/cycles/device/device_cuda.cpp

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

diff --git a/intern/cycles/device/device_cpu.cpp b/intern/cycles/device/device_cpu.cpp
index ad52c90..3f4bea6 100644
--- a/intern/cycles/device/device_cpu.cpp
+++ b/intern/cycles/device/device_cpu.cpp
@@ -567,7 +567,7 @@ public:
 					task.update_progress(&tile);
 				}
 
-				if(tile.buffers->params.overscan) {
+				if(tile.buffers->params.overscan && !task.get_cancel()) {
 					int tile_x[4] = {tile.x, tile.x, tile.x+tile.w, tile.x+tile.w};
 					int tile_y[4] = {tile.y, tile.y, tile.y+tile.h, tile.y+tile.h};
 					int offsets[9] = {0, 0, 0, 0, tile.offset, 0, 0, 0, 0};
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index b8c4879..2b115ca 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -1576,7 +1576,7 @@ public:
 						task->update_progress(&tile);
 					}
 
-					if(tile.buffers->params.overscan) { /* TODO(lukas) Works, but seems hacky? */
+					if(tile.buffers->params.overscan && !task->get_cancel()) { /* TODO(lukas) Works, but seems hacky? */
 						denoise(tile, end_sample);
 					}
 				}




More information about the Bf-blender-cvs mailing list