diff options
| -rw-r--r-- | intern/cycles/render/alembic.h | 2 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/list_sort_impl.h | 2 | ||||
| -rw-r--r-- | source/blender/draw/engines/eevee/eevee_cryptomatte.c | 2 | ||||
| -rw-r--r-- | source/blender/draw/engines/gpencil/gpencil_shader_fx.c | 8 | ||||
| -rw-r--r-- | source/blender/editors/mask/mask_edit.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/mask/mask_ops.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_clip/clip_utils.c | 8 |
7 files changed, 13 insertions, 13 deletions
diff --git a/intern/cycles/render/alembic.h b/intern/cycles/render/alembic.h index 855d774bfdb..77bdac09ba2 100644 --- a/intern/cycles/render/alembic.h +++ b/intern/cycles/render/alembic.h @@ -150,7 +150,7 @@ template<typename T> class DataStore { return; } - /* TODO(@kevindietrich): arrays are emptied when passed to the sockets, so for now we copy the + /* TODO(kevindietrich): arrays are emptied when passed to the sockets, so for now we copy the * arrays to avoid reloading the data */ T value = *data_; node->set(*socket, value); diff --git a/source/blender/blenlib/intern/list_sort_impl.h b/source/blender/blenlib/intern/list_sort_impl.h index 46738803ee8..8f979ba5b0b 100644 --- a/source/blender/blenlib/intern/list_sort_impl.h +++ b/source/blender/blenlib/intern/list_sort_impl.h @@ -205,7 +205,7 @@ BLI_INLINE list_node *sweep_up(struct SortInfo *si, list_node *list, unsigned in * The 'ranks' array essentially captures the recursion stack of a mergesort. * The merge tree is built in a bottom-up manner. The control loop for * updating the 'ranks' array is analogous to incrementing a binary integer, - * and the `O(n)` time for counting upto n translates to `O(n)` merges when + * and the `O(n)` time for counting `upto` n translates to `O(n)` merges when * inserting `rank-0` lists. * When we plug in the sizes of the lists involved in those merges, * we get the `O(n log n)` time for the sort. diff --git a/source/blender/draw/engines/eevee/eevee_cryptomatte.c b/source/blender/draw/engines/eevee/eevee_cryptomatte.c index 90948d67895..31e54e371b1 100644 --- a/source/blender/draw/engines/eevee/eevee_cryptomatte.c +++ b/source/blender/draw/engines/eevee/eevee_cryptomatte.c @@ -363,7 +363,7 @@ static void eevee_cryptomatte_download_buffer(EEVEE_Data *vedata, GPUFrameBuffer download_buffer); /* Integrate download buffer into the accum buffer. - * The download buffer contains upto 3 floats per pixel (one float per cryptomatte layer. + * The download buffer contains up to 3 floats per pixel (one float per cryptomatte layer. * * NOTE: here we deviate from the cryptomatte standard. During integration the standard always * sort the samples by its weight to make sure that samples with the lowest weight diff --git a/source/blender/draw/engines/gpencil/gpencil_shader_fx.c b/source/blender/draw/engines/gpencil/gpencil_shader_fx.c index cb65fbd6ae7..f4af5ebff99 100644 --- a/source/blender/draw/engines/gpencil/gpencil_shader_fx.c +++ b/source/blender/draw/engines/gpencil/gpencil_shader_fx.c @@ -235,7 +235,7 @@ static void gpencil_vfx_rim(RimShaderFxData *fx, Object *ob, gpIterVfxData *iter DRW_shgroup_call_procedural_triangles(grp, NULL, 1); if (fx->mode == eShaderFxRimMode_Overlay) { - /* We cannot do custom blending on MultiTarget framebuffers. + /* We cannot do custom blending on multi-target frame-buffers. * Workaround by doing 2 passes. */ grp = DRW_shgroup_create_sub(grp); DRW_shgroup_state_disable(grp, DRW_STATE_BLEND_MUL); @@ -363,7 +363,7 @@ static void gpencil_vfx_shadow(ShadowShaderFxData *fx, Object *ob, gpIterVfxData copy_v2_v2(wave_ofs, wave_dir); SWAP(float, wave_ofs[0], wave_ofs[1]); wave_ofs[1] *= -1.0f; - /* Keep world space scalling and aspect ratio. */ + /* Keep world space scaling and aspect ratio. */ mul_v2_fl(wave_dir, 1.0f / (max_ff(1e-8f, fx->period) * distance_factor)); mul_v2_v2(wave_dir, vp_size); mul_v2_fl(wave_ofs, fx->amplitude * distance_factor); @@ -515,7 +515,7 @@ static void gpencil_vfx_wave(WaveShaderFxData *fx, Object *ob, gpIterVfxData *it copy_v2_v2(wave_ofs, wave_dir); SWAP(float, wave_ofs[0], wave_ofs[1]); wave_ofs[1] *= -1.0f; - /* Keep world space scalling and aspect ratio. */ + /* Keep world space scaling and aspect ratio. */ mul_v2_fl(wave_dir, 1.0f / (max_ff(1e-8f, fx->period) * distance_factor)); mul_v2_v2(wave_dir, vp_size); mul_v2_fl(wave_ofs, fx->amplitude * distance_factor); @@ -647,7 +647,7 @@ void gpencil_vfx_cache_populate(GPENCIL_Data *vedata, Object *ob, GPENCIL_tObjec DRW_shgroup_uniform_int_copy(grp, "isFirstPass", true); DRW_shgroup_call_procedural_triangles(grp, NULL, 1); - /* We cannot do custom blending on MultiTarget framebuffers. + /* We cannot do custom blending on multi-target frame-buffers. * Workaround by doing 2 passes. */ grp = DRW_shgroup_create_sub(grp); DRW_shgroup_state_disable(grp, DRW_STATE_BLEND_MUL); diff --git a/source/blender/editors/mask/mask_edit.c b/source/blender/editors/mask/mask_edit.c index e6c6424e5f0..f1041d062a8 100644 --- a/source/blender/editors/mask/mask_edit.c +++ b/source/blender/editors/mask/mask_edit.c @@ -207,7 +207,7 @@ void ED_mask_view_lock_state_restore_no_jump(const bContext *C, const MaskViewLo return; } - /* Mask's lock-to-selection requres deformed splines to be evaluated to calculate bounds of + /* Mask's lock-to-selection requires deformed splines to be evaluated to calculate bounds of * points after animation has been evaluated. The restore-no-jump type of function does * calculation of new offset for the view for an updated state of mask to cancel the offset out * by modifying locked offset. In order to do such calculation mask needs to be evaluated after diff --git a/source/blender/editors/mask/mask_ops.c b/source/blender/editors/mask/mask_ops.c index 00a1dfb7d87..98509e82f48 100644 --- a/source/blender/editors/mask/mask_ops.c +++ b/source/blender/editors/mask/mask_ops.c @@ -228,7 +228,7 @@ typedef struct SlidePointData { float prev_mouse_coord[2]; /* Previous clip coordinate which was resolved from mouse position (0, 0). - * Is used to compansate for view offste moving in-between of mouse events when + * Is used to compensate for view offset moving in-between of mouse events when * lock-to-selection is enabled. */ float prev_zero_coord[2]; diff --git a/source/blender/editors/space_clip/clip_utils.c b/source/blender/editors/space_clip/clip_utils.c index faa3f18e8c1..939245288fa 100644 --- a/source/blender/editors/space_clip/clip_utils.c +++ b/source/blender/editors/space_clip/clip_utils.c @@ -499,12 +499,12 @@ bool clip_view_calculate_view_selection( return false; } - /* NOTE: The `fit` argment is set to truth when doing "View to Selected" operator, and it set to + /* NOTE: The `fit` argument is set to truth when doing "View to Selected" operator, and it set to * false when this function is used for Lock-to-Selection functionality. When locking to - * selection the handles are to be ignored. So we can deriver the `include_handles` from `fit`. + * selection the handles are to be ignored. So we can derive the `include_handles` from `fit`. * - * TODO(sergey): Make such decision more explicit. Maybe pass usecase for the calculation to tell - * operator from lock-to-selection apart. */ + * TODO(sergey): Make such decision more explicit. Maybe pass use-case for the calculation to + * tell operator from lock-to-selection apart. */ float min[2], max[2]; if (!selected_boundbox(C, min, max, fit)) { return false; |