diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-08-23 18:34:34 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-08-23 18:34:34 +0400 |
| commit | 01e22d1b9f3606d97f06c2d8a2bc969214322e9c (patch) | |
| tree | fcbb80481ea74c731891b5151c94b1c0b9cbb3d1 /intern/cycles/kernel/kernel.cpp | |
| parent | 22f48748771a96526c3abcfd6583f7cf86aa88c8 (diff) | |
Cycles: more code refactoring to rename things internally as well. Also change
property name back so we keep compatibility.
Diffstat (limited to 'intern/cycles/kernel/kernel.cpp')
| -rw-r--r-- | intern/cycles/kernel/kernel.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/kernel/kernel.cpp b/intern/cycles/kernel/kernel.cpp index 1b887082815..3f357763a8f 100644 --- a/intern/cycles/kernel/kernel.cpp +++ b/intern/cycles/kernel/kernel.cpp @@ -88,12 +88,12 @@ void kernel_tex_copy(KernelGlobals *kg, const char *name, device_ptr mem, size_t void kernel_cpu_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 */ |