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:
authorCampbell Barton <ideasman42@gmail.com>2020-11-20 03:39:03 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-11-20 03:39:22 +0300
commit25266caa454324b3394c09920913fb419b5abf2b (patch)
treed3280dfb512accb74a7e06fc9841d1228e96dd59 /intern
parent5f1bb8da96c47e3feea9853eb479fb565aeaa2fa (diff)
Cleanup: spelling
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/kernel/kernel_light.h2
-rw-r--r--intern/cycles/kernel/kernel_light_background.h4
-rw-r--r--intern/cycles/render/object.cpp2
-rw-r--r--intern/guardedalloc/MEM_guardedalloc.h4
-rw-r--r--intern/guardedalloc/intern/mallocn.c2
5 files changed, 7 insertions, 7 deletions
diff --git a/intern/cycles/kernel/kernel_light.h b/intern/cycles/kernel/kernel_light.h
index 138b90373a6..9650b85a5c2 100644
--- a/intern/cycles/kernel/kernel_light.h
+++ b/intern/cycles/kernel/kernel_light.h
@@ -582,7 +582,7 @@ ccl_device_forceinline void triangle_light_sample(KernelGlobals *kg,
ccl_device int light_distribution_sample(KernelGlobals *kg, float *randu)
{
- /* This is basically std::upper_bound as used by pbrt, to find a point light or
+ /* This is basically std::upper_bound as used by PBRT, to find a point light or
* triangle to emit from, proportional to area. a good improvement would be to
* also sample proportional to power, though it's not so well defined with
* arbitrary shaders. */
diff --git a/intern/cycles/kernel/kernel_light_background.h b/intern/cycles/kernel/kernel_light_background.h
index 5fa25069fcd..2a685c0adfa 100644
--- a/intern/cycles/kernel/kernel_light_background.h
+++ b/intern/cycles/kernel/kernel_light_background.h
@@ -31,7 +31,7 @@ ccl_device float3 background_map_sample(KernelGlobals *kg, float randu, float ra
int res_y = kernel_data.background.map_res_y;
int cdf_width = res_x + 1;
- /* this is basically std::lower_bound as used by pbrt */
+ /* This is basically std::lower_bound as used by PBRT. */
int first = 0;
int count = res_y;
@@ -58,7 +58,7 @@ ccl_device float3 background_map_sample(KernelGlobals *kg, float randu, float ra
float dv = inverse_lerp(cdf_v.y, cdf_next_v.y, randv);
float v = (index_v + dv) / res_y;
- /* this is basically std::lower_bound as used by pbrt */
+ /* This is basically std::lower_bound as used by PBRT. */
first = 0;
count = res_x;
while (count > 0) {
diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp
index 70ce60252f0..a1a08f26229 100644
--- a/intern/cycles/render/object.cpp
+++ b/intern/cycles/render/object.cpp
@@ -171,7 +171,7 @@ void Object::compute_bounds(bool motion_blur)
bounds = BoundBox::empty;
- /* todo: this is really terrible. according to pbrt there is a better
+ /* TODO: this is really terrible. according to PBRT there is a better
* way to find this iteratively, but did not find implementation yet
* or try to implement myself */
for (float t = 0.0f; t < 1.0f; t += (1.0f / 128.0f)) {
diff --git a/intern/guardedalloc/MEM_guardedalloc.h b/intern/guardedalloc/MEM_guardedalloc.h
index 0f30f7bd1a5..a0174e30aff 100644
--- a/intern/guardedalloc/MEM_guardedalloc.h
+++ b/intern/guardedalloc/MEM_guardedalloc.h
@@ -239,7 +239,7 @@ void MEM_use_lockfree_allocator(void);
*
* Use for debug purposes. This allocator contains lock section around every allocator call, which
* makes it slow. What is gained with this is the ability to have list of allocated blocks (in an
- * addition to the trackign of number of allocations and amount of allocated bytes).
+ * addition to the tracking of number of allocations and amount of allocated bytes).
*
* NOTE: The switch between allocator types can only happen before any allocation did happen. */
void MEM_use_guarded_allocator(void);
@@ -249,7 +249,7 @@ void MEM_use_guarded_allocator(void);
#endif /* __cplusplus */
#ifdef __cplusplus
-/* alloc funcs for C++ only */
+/* Allocation functions (for C++ only). */
# define MEM_CXX_CLASS_ALLOC_FUNCS(_id) \
public: \
void *operator new(size_t num_bytes) \
diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c
index f0dd29a0b9e..673821546e8 100644
--- a/intern/guardedalloc/intern/mallocn.c
+++ b/intern/guardedalloc/intern/mallocn.c
@@ -99,7 +99,7 @@ void aligned_free(void *ptr)
/* Perform assert checks on allocator type change.
*
* Helps catching issues (in debug build) caused by an unintended allocator type change when there
- * are allocation happenned. */
+ * are allocation happened. */
static void assert_for_allocator_change(void)
{
/* NOTE: Assume that there is no "sticky" internal state which would make switching allocator