diff options
| author | Patrick Mours <pmours@nvidia.com> | 2022-04-05 18:30:01 +0300 |
|---|---|---|
| committer | Patrick Mours <pmours@nvidia.com> | 2022-04-05 19:09:21 +0300 |
| commit | e51368728815e3700414a77bf91668425a9965ec (patch) | |
| tree | 9285472413877aca15df761e111dfb03ceaeb402 /intern/cycles/session | |
| parent | f60cffad38d12bdfefe503924e93c33a7c89f671 (diff) | |
Cycles: Fix a few type casting warnings
Stumbled over the `integrate_surface_volume_only_bounce` kernel
function not returning the right type. The others too showed up as
warnings when building Cycles as a standalone which didn't have
those warnings disabled.
Differential Revision: https://developer.blender.org/D14558
Diffstat (limited to 'intern/cycles/session')
| -rw-r--r-- | intern/cycles/session/merge.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/session/merge.cpp b/intern/cycles/session/merge.cpp index a88ffee6409..316f56630d6 100644 --- a/intern/cycles/session/merge.cpp +++ b/intern/cycles/session/merge.cpp @@ -531,7 +531,7 @@ static void read_layer_samples(vector<MergeImage> &images, current_layer_samples.total = 0; current_layer_samples.per_pixel.resize(in_spec.width * in_spec.height); std::fill( - current_layer_samples.per_pixel.begin(), current_layer_samples.per_pixel.end(), 0); + current_layer_samples.per_pixel.begin(), current_layer_samples.per_pixel.end(), 0.0f); } if (layer.has_sample_pass) { |