diff options
| author | Julian Eisel <julian@blender.org> | 2020-06-05 14:09:31 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-06-05 14:09:31 +0300 |
| commit | 920a58d9b6d667894cf166cbbd25e4c2fbd238ea (patch) | |
| tree | 7ca5a9da640753b5e070c439ac3bdd14dfad92cf /intern/cycles/kernel/kernel_path_branched.h | |
| parent | c94b6209861ca7cc3985b53474feed7d94c0221a (diff) | |
| parent | a1d55bdd530390e58c51abe9707b8d3b0ae3e861 (diff) | |
Merge branch 'master' into wm-drag-drop-rewritewm-drag-drop-rewrite
Diffstat (limited to 'intern/cycles/kernel/kernel_path_branched.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_path_branched.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernel_path_branched.h b/intern/cycles/kernel/kernel_path_branched.h index 337c4fb1d10..b9569f531e6 100644 --- a/intern/cycles/kernel/kernel_path_branched.h +++ b/intern/cycles/kernel/kernel_path_branched.h @@ -526,7 +526,7 @@ ccl_device void kernel_branched_path_trace( if (kernel_data.film.pass_adaptive_aux_buffer) { ccl_global float4 *aux = (ccl_global float4 *)(buffer + kernel_data.film.pass_adaptive_aux_buffer); - if (aux->w > 0.0f) { + if ((*aux).w > 0.0f) { return; } } |