[Bf-blender-cvs] [c9fb08e0757] master: Merge branch 'blender-v3.0-release'

[Hans Goudey]

Commit: c9fb08e075733fbba11be3dd1881fb3422fc6b94
Author: Hans Goudey
Date:   Tue Nov 16 14:55:13 2021 -0600
Branches: master
https://developer.blender.org/rBc9fb08e075733fbba11be3dd1881fb3422fc6b94

Merge branch 'blender-v3.0-release'

===================================================================



===================================================================

diff --cc intern/cycles/integrator/path_trace.cpp
index 81e9341af26,92bf8e69d19..ec90681b78a
--- a/intern/cycles/integrator/path_trace.cpp
+++ b/intern/cycles/integrator/path_trace.cpp
@@@ -850,10 -847,10 +850,11 @@@ void PathTrace::progress_update_if_need
  {
    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.num_samples -
 +                               render_work.path_trace.sample_offset;
      progress_->add_samples(num_samples_added, current_sample);
    }