Commit: 975c048ecd3dc2fc4a391709696bcca5239448cf
Author: Brecht Van Lommel
Date: Fri Jan 3 19:24:55 2014 +0100
https://developer.blender.org/rB975c048ecd3dc2fc4a391709696bcca5239448cf
Fix gcc compile error in last commit.
===================================================================
M intern/cycles/kernel/kernel_random.h
===================================================================
diff --git a/intern/cycles/kernel/kernel_random.h
b/intern/cycles/kernel/kernel_random.h
index e3b1c1d..ef39726 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);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
