diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-08-11 19:27:04 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-08-11 19:27:04 +0400 |
| commit | 48ae40ccdf5475506700b7b50e5e677ecf301479 (patch) | |
| tree | 380c89544ffec9a3aa22dbd865322a2345bcd15f /intern/cycles/kernel/kernel_path.h | |
| parent | 910d1ff2666a3abd66228bc2ac1654dcd3ee00e3 (diff) | |
Code cleanup / Cycles:
* Rename "curve_kernel_data" to just "curve", to avoid redundant naming.
Diffstat (limited to 'intern/cycles/kernel/kernel_path.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_path.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/kernel/kernel_path.h b/intern/cycles/kernel/kernel_path.h index d6863af8462..bf06f8dd5f6 100644 --- a/intern/cycles/kernel/kernel_path.h +++ b/intern/cycles/kernel/kernel_path.h @@ -271,10 +271,10 @@ __device float4 kernel_path_progressive(KernelGlobals *kg, RNG *rng, int sample, if((kernel_data.cam.resolution == 1) && (state.flag & PATH_RAY_CAMERA)) { float3 pixdiff = ray.dD.dx + ray.dD.dy; /*pixdiff = pixdiff - dot(pixdiff, ray.D)*ray.D;*/ - difl = kernel_data.curve_kernel_data.minimum_width * len(pixdiff) * 0.5f; + difl = kernel_data.curve.minimum_width * len(pixdiff) * 0.5f; } - extmax = kernel_data.curve_kernel_data.maximum_width; + extmax = kernel_data.curve.maximum_width; lcg_state = lcg_init(*rng + rng_offset + sample*0x51633e2d); } @@ -990,10 +990,10 @@ __device float4 kernel_path_non_progressive(KernelGlobals *kg, RNG *rng, int sam if((kernel_data.cam.resolution == 1) && (state.flag & PATH_RAY_CAMERA)) { float3 pixdiff = ray.dD.dx + ray.dD.dy; /*pixdiff = pixdiff - dot(pixdiff, ray.D)*ray.D;*/ - difl = kernel_data.curve_kernel_data.minimum_width * len(pixdiff) * 0.5f; + difl = kernel_data.curve.minimum_width * len(pixdiff) * 0.5f; } - extmax = kernel_data.curve_kernel_data.maximum_width; + extmax = kernel_data.curve.maximum_width; lcg_state = lcg_init(*rng + rng_offset + sample*0x51633e2d); } |