From e12adeb8c98d0ef211aba2cb5c0e87ff775fe217 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 28 Mar 2012 12:18:12 +0000 Subject: Fix #30551: cycles passes combining did not always give identical result combined with antialiasing/defocus, now divide out color at the very end instead of for each sample. --- intern/cycles/kernel/kernel_accumulate.h | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'intern/cycles/kernel/kernel_accumulate.h') diff --git a/intern/cycles/kernel/kernel_accumulate.h b/intern/cycles/kernel/kernel_accumulate.h index 1e6605541ca..7ba50973444 100644 --- a/intern/cycles/kernel/kernel_accumulate.h +++ b/intern/cycles/kernel/kernel_accumulate.h @@ -266,17 +266,6 @@ __device_inline void path_radiance_accum_background(PathRadiance *L, float3 thro #endif } -__device_inline float3 safe_divide_color(float3 a, float3 b) -{ - float x, y, z; - - x = (b.x != 0.0f)? a.x/b.x: 0.0f; - y = (b.y != 0.0f)? a.y/b.y: 0.0f; - z = (b.z != 0.0f)? a.z/b.z: 0.0f; - - return make_float3(x, y, z); -} - __device_inline float3 path_radiance_sum(PathRadiance *L) { #ifdef __PASSES__ -- cgit v1.2.3