From 01e22d1b9f3606d97f06c2d8a2bc969214322e9c Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 23 Aug 2013 14:34:34 +0000 Subject: Cycles: more code refactoring to rename things internally as well. Also change property name back so we keep compatibility. --- intern/cycles/kernel/kernel_sse2.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'intern/cycles/kernel/kernel_sse2.cpp') diff --git a/intern/cycles/kernel/kernel_sse2.cpp b/intern/cycles/kernel/kernel_sse2.cpp index 518a904cc69..e0413ddf445 100644 --- a/intern/cycles/kernel/kernel_sse2.cpp +++ b/intern/cycles/kernel/kernel_sse2.cpp @@ -37,12 +37,12 @@ CCL_NAMESPACE_BEGIN void kernel_cpu_sse2_path_trace(KernelGlobals *kg, float *buffer, unsigned int *rng_state, int sample, int x, int y, int offset, int stride) { -#ifdef __NON_PROGRESSIVE__ - if(!kernel_data.integrator.progressive) - kernel_path_trace_non_progressive(kg, buffer, rng_state, sample, x, y, offset, stride); +#ifdef __BRANCHED_PATH__ + if(kernel_data.integrator.branched) + kernel_branched_path_trace(kg, buffer, rng_state, sample, x, y, offset, stride); else #endif - kernel_path_trace_progressive(kg, buffer, rng_state, sample, x, y, offset, stride); + kernel_path_trace(kg, buffer, rng_state, sample, x, y, offset, stride); } /* Tonemapping */ -- cgit v1.2.3