[Bf-blender-cvs] [74c896c0819] master: Cleanup: typos in comments, remove libnumaapi reference

Campbell Barton noreply at git.blender.org
Mon Jan 10 03:50:21 CET 2022


Commit: 74c896c0819bd95004b0b11925d51586570f980f
Author: Campbell Barton
Date:   Mon Jan 10 13:47:12 2022 +1100
Branches: master
https://developer.blender.org/rB74c896c0819bd95004b0b11925d51586570f980f

Cleanup: typos in comments, remove libnumaapi reference

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

M	doc/doxygen/doxygen.intern.h
M	intern/cycles/blender/display_driver.cpp
M	intern/cycles/integrator/path_trace_display.h
M	intern/cycles/integrator/render_scheduler.h
M	intern/cycles/kernel/svm/magic.h
M	intern/cycles/kernel/svm/types.h
M	source/blender/draw/intern/draw_manager.c
M	source/blender/render/intern/zbuf.h
M	source/blender/simulation/intern/hair_volume.cpp
M	source/blender/windowmanager/intern/wm_event_system.c

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

diff --git a/doc/doxygen/doxygen.intern.h b/doc/doxygen/doxygen.intern.h
index b6145e22a90..5dcb472b282 100644
--- a/doc/doxygen/doxygen.intern.h
+++ b/doc/doxygen/doxygen.intern.h
@@ -51,9 +51,6 @@
 /** \defgroup intern_mikktspace MikktSpace
  *  \ingroup intern */
 
-/** \defgroup intern_numaapi NUMA (Non Uniform Memory Architecture)
- *  \ingroup intern */
-
 /** \defgroup intern_rigidbody Rigid-Body C-API
  *  \ingroup intern */
 
diff --git a/intern/cycles/blender/display_driver.cpp b/intern/cycles/blender/display_driver.cpp
index 7524a3adf37..3eab2bb8507 100644
--- a/intern/cycles/blender/display_driver.cpp
+++ b/intern/cycles/blender/display_driver.cpp
@@ -941,7 +941,7 @@ void BlenderDisplayDriver::draw(const Params &params)
 
   glActiveTexture(GL_TEXTURE0);
 
-  /* NOTE: THe VAO is to be allocated on the drawing context as it is not shared across contects.
+  /* NOTE: The VAO is to be allocated on the drawing context as it is not shared across contexts.
    * Simplest is to allocate it on every redraw so that it is possible to destroy it from a
    * correct context. */
   GLuint vertex_array_object;
diff --git a/intern/cycles/integrator/path_trace_display.h b/intern/cycles/integrator/path_trace_display.h
index b9aff5f6000..906d7d54029 100644
--- a/intern/cycles/integrator/path_trace_display.h
+++ b/intern/cycles/integrator/path_trace_display.h
@@ -46,7 +46,7 @@ class PathTraceDisplay {
    *
    * This call will configure parameters for a changed buffer and reset the texture state.
    *
-   * When the `reset_rendering` a complete displat reset happens. When it is false reset happens
+   * When the `reset_rendering` a complete display reset happens. When it is false reset happens
    * for a new state of the buffer parameters which is assumed to correspond to the next tile. */
   void reset(const BufferParams &buffer_params, bool reset_rendering);
 
diff --git a/intern/cycles/integrator/render_scheduler.h b/intern/cycles/integrator/render_scheduler.h
index 28f563c46e3..d08e077257f 100644
--- a/intern/cycles/integrator/render_scheduler.h
+++ b/intern/cycles/integrator/render_scheduler.h
@@ -283,7 +283,7 @@ class RenderScheduler {
   /* Check whether timing report about the given work need to reset accumulated average time. */
   bool work_report_reset_average(const RenderWork &render_work);
 
-  /* CHeck whether render time limit has been reached (or exceeded), and if so store related
+  /* Check whether render time limit has been reached (or exceeded), and if so store related
    * information in the state so that rendering is considered finished, and is possible to report
    * average render time information. */
   void check_time_limit_reached();
diff --git a/intern/cycles/kernel/svm/magic.h b/intern/cycles/kernel/svm/magic.h
index 715a47d88cf..cdd73a7829a 100644
--- a/intern/cycles/kernel/svm/magic.h
+++ b/intern/cycles/kernel/svm/magic.h
@@ -25,7 +25,7 @@ ccl_device_noinline_cpu float3 svm_magic(float3 p, float scale, int n, float dis
   /*
    * Prevent NaNs due to input p
    * Sin and Cosine are periodic about [0 2*PI) so the following
-   * will yeild a more accurate result. As it stops the input values
+   * will yield a more accurate result. As it stops the input values
    * going out of range for floats which caused a NaN. The
    * calculation of (px + py + pz)*5 can cause an Inf when one or more
    * values are very large the cos or sin of this results in a NaN
diff --git a/intern/cycles/kernel/svm/types.h b/intern/cycles/kernel/svm/types.h
index 384549b7f09..dd1b1f9bc28 100644
--- a/intern/cycles/kernel/svm/types.h
+++ b/intern/cycles/kernel/svm/types.h
@@ -124,7 +124,7 @@ typedef enum ShaderNodeType {
   NODE_AOV_VALUE,
   NODE_FLOAT_CURVE,
   /* NOTE: for best OpenCL performance, item definition in the enum must
-   * match the switch case order in svm.h. */
+   * match the switch case order in `svm.h`. */
 } ShaderNodeType;
 
 typedef enum NodeAttributeOutputType {
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 86ed08c5b0f..1c7a02339bc 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -757,7 +757,7 @@ static void duplidata_key_free(void *key)
   }
   else {
     Object temp_object = *dupli_key->ob;
-    /* Do not modify the original boundbox. */
+    /* Do not modify the original bound-box. */
     temp_object.runtime.bb = NULL;
     BKE_object_replace_data_on_shallow_copy(&temp_object, dupli_key->ob_data);
     drw_batch_cache_generate_requested(&temp_object);
diff --git a/source/blender/render/intern/zbuf.h b/source/blender/render/intern/zbuf.h
index c5108a9d6a7..3e4832e04d6 100644
--- a/source/blender/render/intern/zbuf.h
+++ b/source/blender/render/intern/zbuf.h
@@ -24,7 +24,7 @@
 extern "C" {
 #endif
 
-/* span fill in method, is also used to localize data for zbuffering */
+/** Span fill in method, is also used to localize data for Z-buffering. */
 typedef struct ZSpan {
   int rectx, recty; /* range for clipping */
 
diff --git a/source/blender/simulation/intern/hair_volume.cpp b/source/blender/simulation/intern/hair_volume.cpp
index d4550eec5d6..f9b61fe9942 100644
--- a/source/blender/simulation/intern/hair_volume.cpp
+++ b/source/blender/simulation/intern/hair_volume.cpp
@@ -842,8 +842,8 @@ bool SIM_hair_volume_solve_divergence(HairGrid *grid,
   }
 
   /* Main Poisson equation system:
-   * This is derived from the discretezation of the Poisson equation
-   *   div(grad(p)) = div(v)
+   * This is derived from the discretization of the Poisson equation:
+   *   `div(grad(p)) = div(v)`
    *
    * The finite difference approximation yields the linear equation system described here:
    * https://en.wikipedia.org/wiki/Discrete_Poisson_equation
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index ef644da5578..28d8413fe0b 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -2263,7 +2263,7 @@ static int wm_handler_operator_call(bContext *C,
           CTX_wm_region_set(C, NULL);
         }
 
-        /* /update gizmos during modal handlers. */
+        /* Update gizmos during modal handlers. */
         wm_gizmomaps_handled_modal_update(C, event, handler);
 
         /* Remove modal handler, operator itself should have been canceled and freed. */



More information about the Bf-blender-cvs mailing list