[Bf-blender-cvs] [19e493dfc4e] cycles-x: Cycles X: Fix some typos in code comments.

Thomas Dinges noreply at git.blender.org
Sun Aug 22 15:09:35 CEST 2021


Commit: 19e493dfc4e6b210bd5635249755808df80810b6
Author: Thomas Dinges
Date:   Sun Aug 22 15:08:33 2021 +0200
Branches: cycles-x
https://developer.blender.org/rB19e493dfc4e6b210bd5635249755808df80810b6

Cycles X: Fix some typos in code comments.

Thanks to Alaska for finding these.

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

M	intern/cycles/integrator/adaptive_sampling.cpp
M	intern/cycles/integrator/render_scheduler.cpp
M	intern/cycles/integrator/render_scheduler.h
M	intern/cycles/kernel/integrator/integrator_init_from_camera.h

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

diff --git a/intern/cycles/integrator/adaptive_sampling.cpp b/intern/cycles/integrator/adaptive_sampling.cpp
index a899b84c428..23fbcfea5c2 100644
--- a/intern/cycles/integrator/adaptive_sampling.cpp
+++ b/intern/cycles/integrator/adaptive_sampling.cpp
@@ -43,7 +43,7 @@ int AdaptiveSampling::align_samples(int start_sample, int num_samples) const
   /* 0-based sample index at which first filtering will happen. */
   const int first_filter_sample = (min_samples + 1) | (adaptive_step - 1);
 
-  /* Allow as many sampels as possible until the first filter sample. */
+  /* Allow as many samples as possible until the first filter sample. */
   if (start_sample + num_samples <= first_filter_sample) {
     return num_samples;
   }
diff --git a/intern/cycles/integrator/render_scheduler.cpp b/intern/cycles/integrator/render_scheduler.cpp
index 7d0012ba705..b33c2068dc9 100644
--- a/intern/cycles/integrator/render_scheduler.cpp
+++ b/intern/cycles/integrator/render_scheduler.cpp
@@ -351,7 +351,7 @@ static double approximate_final_time(const RenderWork &render_work, double time)
 
 void RenderScheduler::report_work_begin(const RenderWork &render_work)
 {
-  /* Start counting render time when rendering sampels at their final resolution.
+  /* Start counting render time when rendering samples at their final resolution.
    *
    * NOTE: The work might have the path trace part be all zero: this happens when a post-processing
    * work is scheduled after the path tracing. Checking for just a start sample doesn't work here
@@ -607,7 +607,7 @@ double RenderScheduler::guess_display_update_interval_in_seconds_for_num_samples
     int num_rendered_samples) const
 {
   /* TODO(sergey): Need a decision on whether this should be using number of samples rendered
-   * within the current render ression, or use absolute number of samples with the start sample
+   * within the current render session, or use absolute number of samples with the start sample
    * taken into account. It will depend on whether the start sample offset clears the render
    * buffer. */
 
@@ -707,7 +707,7 @@ int RenderScheduler::get_num_samples_to_path_trace() const
   /* Round number of samples to a power of two, so that division of path states into tiles goes in
    * a more integer manner.
    * This might make it so updates happens more rarely due to rounding up. In the test scenes this
-   * is not huge deal because it is not seen that more than 8 sampels can be rendered between
+   * is not huge deal because it is not seen that more than 8 samples can be rendered between
    * updates. If that becomes a problem we can add some extra rules like never allow to round up
    * more than N samples. */
   const int num_samples_pot = round_num_samples_to_power_of_2(num_samples_per_update);
diff --git a/intern/cycles/integrator/render_scheduler.h b/intern/cycles/integrator/render_scheduler.h
index 1178acc7a3d..dc354737f6f 100644
--- a/intern/cycles/integrator/render_scheduler.h
+++ b/intern/cycles/integrator/render_scheduler.h
@@ -93,7 +93,7 @@ class RenderScheduler {
   void set_start_sample(int start_sample);
   int get_start_sample() const;
 
-  /* Number of sampels to render, starting from start sample.
+  /* Number of samples to render, starting from start sample.
    * The scheduler will schedule work in the range of
    * [start_sample, start_sample + num_samples - 1], inclusively. */
   void set_num_samples(int num_samples);
diff --git a/intern/cycles/kernel/integrator/integrator_init_from_camera.h b/intern/cycles/kernel/integrator/integrator_init_from_camera.h
index 247bc1ea34a..58e7bde4c94 100644
--- a/intern/cycles/kernel/integrator/integrator_init_from_camera.h
+++ b/intern/cycles/kernel/integrator/integrator_init_from_camera.h
@@ -82,7 +82,7 @@ ccl_device bool integrator_init_from_camera(INTEGRATOR_STATE_ARGS,
 
   /* Count the sample and get an effective sample for this pixel.
    *
-   * This logic allows to both count actual number of sampels per pixel, and to add samples to this
+   * This logic allows to both count actual number of samples per pixel, and to add samples to this
    * pixel after it was converged and samples were added somewhere else (in which case the
    * `scheduled_sample` will be different from actual number of samples in this pixel). */
   const int sample = kernel_accum_sample(INTEGRATOR_STATE_PASS, render_buffer, scheduled_sample);



More information about the Bf-blender-cvs mailing list