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
diff options
context:
space:
mode:
authorHans Goudey <h.goudey@me.com>2021-11-16 23:55:13 +0300
committerHans Goudey <h.goudey@me.com>2021-11-16 23:55:13 +0300
commitc9fb08e075733fbba11be3dd1881fb3422fc6b94 (patch)
treec8bfd87b1a6ef7728ea3dbc10d578cc007bfe0c5 /intern/cycles/integrator
parent9d7422b817d143b4c50c00c7d5b860a9e414c517 (diff)
parentf30e1fd2f0648d6c88bc61142ecc003ffa33ce11 (diff)
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'intern/cycles/integrator')
-rw-r--r--intern/cycles/integrator/path_trace.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/integrator/path_trace.cpp b/intern/cycles/integrator/path_trace.cpp
index 81e9341af26..ec90681b78a 100644
--- a/intern/cycles/integrator/path_trace.cpp
+++ b/intern/cycles/integrator/path_trace.cpp
@@ -850,7 +850,8 @@ void PathTrace::progress_update_if_needed(const RenderWork &render_work)
{
if (progress_ != nullptr) {
const int2 tile_size = get_render_tile_size();
- const int num_samples_added = tile_size.x * tile_size.y * render_work.path_trace.num_samples;
+ const uint64_t num_samples_added = uint64_t(tile_size.x) * tile_size.y *
+ render_work.path_trace.num_samples;
const int current_sample = render_work.path_trace.start_sample +
render_work.path_trace.num_samples -
render_work.path_trace.sample_offset;