[Bf-blender-cvs] [ccde2c7c31] soc-2016-cycles_denoising: Cycles Denoising: Fix building without filter debugging

Lukas Stockner noreply at git.blender.org
Wed Feb 1 18:22:17 CET 2017


Commit: ccde2c7c316390df050630966040f240fd2c2e4c
Author: Lukas Stockner
Date:   Wed Feb 1 18:10:03 2017 +0100
Branches: soc-2016-cycles_denoising
https://developer.blender.org/rBccde2c7c316390df050630966040f240fd2c2e4c

Cycles Denoising: Fix building without filter debugging

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

M	intern/cycles/device/device_cpu.cpp

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

diff --git a/intern/cycles/device/device_cpu.cpp b/intern/cycles/device/device_cpu.cpp
index 8eec354673..e449d97c86 100644
--- a/intern/cycles/device/device_cpu.cpp
+++ b/intern/cycles/device/device_cpu.cpp
@@ -348,7 +348,7 @@ public:
 			for(int i = 0; i < 9; i++) {
 				buffer[i] = buffers[i] + frame_strides[i]*frame;
 			}
-			DebugPasses debug((rect.z - rect.x), h, 40, 1, w);
+			DebugPasses debug((rect.z - rect.x), h, 42, 1, w);
 
 #define PASSPTR(i) (filter_buffer + (i)*pass_stride)
 
@@ -447,6 +447,7 @@ public:
 					}
 				}
 			}
+
 #ifdef WITH_CYCLES_DEBUG_FILTER
 			{
 				float *temp1 = new float[pass_stride], *temp2 = new float[pass_stride], *temp3 = new float[3*pass_stride], *out = new float[3*pass_stride];
@@ -464,8 +465,8 @@ public:
 				delete[] temp2;
 				delete[] temp3;
 				delete[] out;
-#endif
 			}
+#endif
 
 			debug.write(string_printf("debug_tile_%d_%d.exr", rect.x, rect.y));
 		}




More information about the Bf-blender-cvs mailing list