Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorBrecht Van Lommel <brecht@blender.org>2021-02-12 17:22:21 +0300
committerBrecht Van Lommel <brecht@blender.org>2021-02-12 17:22:21 +0300
commitdad32cbd17790cbd6d8fd30758a69315274fbb24 (patch)
treedf77bfd23bae33ae06f06135df1affbb2588ebcc /intern
parent7db00556fa9a14f8617c2ec1e35ae834689f0da7 (diff)
parent9febda912b04559277d465b9610334c04a73d2ce (diff)
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/kernel/kernel_bake.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernel_bake.h b/intern/cycles/kernel/kernel_bake.h
index ddcf94be1de..ded914c05d7 100644
--- a/intern/cycles/kernel/kernel_bake.h
+++ b/intern/cycles/kernel/kernel_bake.h
@@ -233,6 +233,7 @@ ccl_device void kernel_bake_evaluate(
ccl_global float *differential = buffer + kernel_data.film.pass_bake_differential;
ccl_global float *output = buffer + kernel_data.film.pass_combined;
+ int seed = __float_as_uint(primitive[0]);
int prim = __float_as_uint(primitive[1]);
if (prim == -1)
return;
@@ -240,7 +241,7 @@ ccl_device void kernel_bake_evaluate(
prim += kernel_data.bake.tri_offset;
/* Random number generator. */
- uint rng_hash = hash_uint2(x, y) ^ kernel_data.integrator.seed;
+ uint rng_hash = hash_uint(seed) ^ kernel_data.integrator.seed;
int num_samples = kernel_data.integrator.aa_samples;
float filter_x, filter_y;