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
path: root/intern
diff options
context:
space:
mode:
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/blender/display_driver.cpp2
-rw-r--r--intern/cycles/integrator/path_trace_display.h2
-rw-r--r--intern/cycles/integrator/render_scheduler.h2
-rw-r--r--intern/cycles/kernel/svm/magic.h2
-rw-r--r--intern/cycles/kernel/svm/types.h2
5 files changed, 5 insertions, 5 deletions
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 {