diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-01-03 22:24:55 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-01-03 22:24:55 +0400 |
commit | 975c048ecd3dc2fc4a391709696bcca5239448cf (patch) | |
tree | 0a77b54dc03f74aec8ca05303c7c03634e8b3702 /intern | |
parent | ca7060662d560a86cc5d08be881cba2a79800c2a (diff) |
Fix gcc compile error in last commit.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/kernel/kernel_random.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernel_random.h b/intern/cycles/kernel/kernel_random.h index e3b1c1d7822..ef397269ec2 100644 --- a/intern/cycles/kernel/kernel_random.h +++ b/intern/cycles/kernel/kernel_random.h @@ -287,7 +287,7 @@ ccl_device_inline void path_state_branch(PathState *state, int branch, int num_b state->num_samples = state->num_samples*num_branches; } -ccl_device inline uint lcg_state_init(RNG *rng, PathState *state, uint scramble) +ccl_device_inline uint lcg_state_init(RNG *rng, PathState *state, uint scramble) { return lcg_init(*rng + state->rng_offset + state->sample*scramble); } |