diff options
| author | Peter Kim <pk15950@gmail.com> | 2021-10-03 06:22:05 +0300 |
|---|---|---|
| committer | Peter Kim <pk15950@gmail.com> | 2021-10-03 06:22:05 +0300 |
| commit | 6fc81d6bca6424a1e44305df7cdc3598e03b00ba (patch) | |
| tree | a66f17c5378f2a68f4c5d8b09f56687c3d9bf888 /intern/cycles/kernel/kernel_film.h | |
| parent | 85e1f28fcaafd137a546bf192777b00f96851e80 (diff) | |
| parent | d3afe0c1265c9ebb53053de68f176b30f0132281 (diff) | |
Merge branch 'master' into xr-controller-supportxr-controller-support
Diffstat (limited to 'intern/cycles/kernel/kernel_film.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_film.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernel_film.h b/intern/cycles/kernel/kernel_film.h index 715d764fb31..e8f4a21878e 100644 --- a/intern/cycles/kernel/kernel_film.h +++ b/intern/cycles/kernel/kernel_film.h @@ -394,7 +394,7 @@ film_calculate_shadow_catcher(const KernelFilmConvert *ccl_restrict kfilm_conver /* NOTE: It is possible that the Shadow Catcher pass is requested as an output without actual * shadow catcher objects in the scene. In this case there will be no auxiliary passes required - * for the devision (to save up memory). So delay the asserts to this point so that the number of + * for the decision (to save up memory). So delay the asserts to this point so that the number of * samples check handles such configuration. */ kernel_assert(kfilm_convert->pass_offset != PASS_UNUSED); kernel_assert(kfilm_convert->pass_combined != PASS_UNUSED); |