diff options
| -rw-r--r-- | intern/cycles/bvh/bvh_embree.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/kernel_compat_cpu.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/image.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/library_override.c | 4 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/library_remap.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/subdiv_eval.c | 5 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/workspace.c | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/tools/bmesh_bevel.c | 2 | ||||
| -rw-r--r-- | source/blender/draw/engines/gpencil/gpencil_engine.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/gpencil/annotate_draw.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_file/filesel.c | 6 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_access.c | 8 | ||||
| -rw-r--r-- | source/blender/render/intern/source/imagetexture.c | 4 |
13 files changed, 23 insertions, 22 deletions
diff --git a/intern/cycles/bvh/bvh_embree.cpp b/intern/cycles/bvh/bvh_embree.cpp index 088ec759331..53f0b35a103 100644 --- a/intern/cycles/bvh/bvh_embree.cpp +++ b/intern/cycles/bvh/bvh_embree.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -/* This class implemens a ray accelerator for Cycles using Intel's Embree library. +/* This class implements a ray accelerator for Cycles using Intel's Embree library. * It supports triangles, curves, object and deformation blur and instancing. * Not supported are thick line segments, those have no native equivalent in Embree. * They could be implemented using Embree's thick curves, at the expense of wasted memory. diff --git a/intern/cycles/kernel/kernel_compat_cpu.h b/intern/cycles/kernel/kernel_compat_cpu.h index e8fedca4489..006dd00dd73 100644 --- a/intern/cycles/kernel/kernel_compat_cpu.h +++ b/intern/cycles/kernel/kernel_compat_cpu.h @@ -79,7 +79,7 @@ template<typename T> struct texture { } #if defined(__KERNEL_AVX__) || defined(__KERNEL_AVX2__) /* Reads 256 bytes but indexes in blocks of 128 bytes to maintain - * compatibility with existing indicies and data structures. + * compatibility with existing indices and data structures. */ ccl_always_inline avxf fetch_avxf(const int index) { diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 14b6bc953b2..d94ede0e69e 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -247,7 +247,7 @@ void BKE_image_free_buffers_ex(Image *ima, bool do_lock) } if (!G.background) { - /* Background mode doesn't use opnegl, + /* Background mode doesn't use OpenGL, * so we can avoid freeing GPU images and save some * time by skipping mutex lock. */ diff --git a/source/blender/blenkernel/intern/library_override.c b/source/blender/blenkernel/intern/library_override.c index caa50cd0ebf..fed90ad8982 100644 --- a/source/blender/blenkernel/intern/library_override.c +++ b/source/blender/blenkernel/intern/library_override.c @@ -660,7 +660,7 @@ void BKE_override_library_update(Main *bmain, ID *local) * Actually, maybe not! Since we are swapping with original ID's local content, we want to * keep user-count in correct state when freeing tmp_id * (and that user-counts of IDs used by 'new' local data also remain correct). */ - /* This would imply change in handling of usercout all over RNA + /* This would imply change in handling of user-count all over RNA * (and possibly all over Blender code). * Not impossible to do, but would rather see first if extra useless usual user handling * is actually a (performances) issue here. */ @@ -733,7 +733,7 @@ void BKE_main_override_library_update(Main *bmain) * where we only define values that need differential data. * * This avoids us having to modify 'real' data-block at write time (and restoring it afterwards), - * which is inneficient, and potentially dangerous (in case of concurrent access...), while not + * which is inefficient, and potentially dangerous (in case of concurrent access...), while not * using much extra memory in typical cases. It also ensures stored data-block always contains * exact same data as "desired" ones (kind of "baked" data-blocks). */ diff --git a/source/blender/blenkernel/intern/library_remap.c b/source/blender/blenkernel/intern/library_remap.c index 934544b3173..8fe2552c03f 100644 --- a/source/blender/blenkernel/intern/library_remap.c +++ b/source/blender/blenkernel/intern/library_remap.c @@ -484,7 +484,7 @@ static void libblock_remap_data( FOREACH_MAIN_ID_END; } - /* XXX We may not want to always 'transfer' fakeuser from old to new id... + /* XXX We may not want to always 'transfer' fake-user from old to new id... * Think for now it's desired behavior though, * we can always add an option (flag) to control this later if needed. */ if (old_id && (old_id->flag & LIB_FAKEUSER)) { diff --git a/source/blender/blenkernel/intern/subdiv_eval.c b/source/blender/blenkernel/intern/subdiv_eval.c index 34f0eeaab7b..cb042e087d5 100644 --- a/source/blender/blenkernel/intern/subdiv_eval.c +++ b/source/blender/blenkernel/intern/subdiv_eval.c @@ -104,11 +104,10 @@ static void set_face_varying_data_from_uv(Subdiv *subdiv, for (int face_index = 0; face_index < num_faces; ++face_index) { const int num_face_vertices = topology_refiner->getNumFaceVertices(topology_refiner, face_index); - const int *uv_indicies = topology_refiner->getFaceFVarValueIndices( + const int *uv_indices = topology_refiner->getFaceFVarValueIndices( topology_refiner, face_index, layer_index); for (int vertex_index = 0; vertex_index < num_face_vertices; vertex_index++, mluv++) { - evaluator->setFaceVaryingData( - evaluator, layer_index, mluv->uv, uv_indicies[vertex_index], 1); + evaluator->setFaceVaryingData(evaluator, layer_index, mluv->uv, uv_indices[vertex_index], 1); } } } diff --git a/source/blender/blenkernel/intern/workspace.c b/source/blender/blenkernel/intern/workspace.c index 387d4ec5773..dd2b182474e 100644 --- a/source/blender/blenkernel/intern/workspace.c +++ b/source/blender/blenkernel/intern/workspace.c @@ -118,7 +118,7 @@ static void *workspace_relation_get_data_matching_parent(const ListBase *relatio * Checks if \a screen is already used within any workspace. A screen should never be assigned to * multiple WorkSpaceLayouts, but that should be ensured outside of the BKE_workspace module * and without such checks. - * Hence, this should only be used as assert check before assigining a screen to a workspace. + * Hence, this should only be used as assert check before assigning a screen to a workspace. */ #ifndef NDEBUG static bool workspaces_is_screen_used diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c index e0ac390fda4..c8338081443 100644 --- a/source/blender/bmesh/tools/bmesh_bevel.c +++ b/source/blender/bmesh/tools/bmesh_bevel.c @@ -3055,7 +3055,7 @@ static void adjust_the_cycle_or_chain(BoundVert *vstart, bool iscycle) * on loop slide edges, the widths at each end could be different. * * It turns out that the dependent offsets either form chains or - * cycles, and we can process each of those separatey. + * cycles, and we can process each of those separately. */ static void adjust_offsets(BevelParams *bp, BMesh *bm) { diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c index 233e2ee2deb..6d1227bb0a8 100644 --- a/source/blender/draw/engines/gpencil/gpencil_engine.c +++ b/source/blender/draw/engines/gpencil/gpencil_engine.c @@ -467,8 +467,8 @@ void GPENCIL_cache_init(void *vedata) DRW_shgroup_uniform_int(mix_shgrp, "do_select", &stl->storage->do_select_outline, 1); DRW_shgroup_uniform_vec4(mix_shgrp, "select_color", stl->storage->select_color, 1); - /* mix pass no blend used to copy between passes. A separated pass is required - * because if mix_pass is used, the acumulation of blend degrade the colors. + /* Mix pass no blend used to copy between passes. A separated pass is required + * because if mix_pass is used, the accumulation of blend degrade the colors. * * This pass is used too to take the snapshot used for background_pass. This image * will be used as the background while the user is drawing. diff --git a/source/blender/editors/gpencil/annotate_draw.c b/source/blender/editors/gpencil/annotate_draw.c index a853e2bcc9a..e8f97290173 100644 --- a/source/blender/editors/gpencil/annotate_draw.c +++ b/source/blender/editors/gpencil/annotate_draw.c @@ -667,7 +667,7 @@ static void annotation_draw_strokes_edit(bGPdata *gpd, continue; } - /* Optimisation: only draw points for selected strokes + /* Optimization: only draw points for selected strokes * We assume that selected points can only occur in * strokes that are selected too. */ diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c index fab3cfbb69d..faaecd975a3 100644 --- a/source/blender/editors/space_file/filesel.c +++ b/source/blender/editors/space_file/filesel.c @@ -786,8 +786,10 @@ void ED_fileselect_exit(wmWindowManager *wm, ScrArea *sa, SpaceFile *sfile) } } -/** Helper used by both main update code, and smoothscroll timer, - * to try to enable rename editing from #FileSelectParams.renamefile name. */ +/** + * Helper used by both main update code, and smooth-scroll timer, + * to try to enable rename editing from #FileSelectParams.renamefile name. + */ void file_params_renamefile_activate(SpaceFile *sfile, FileSelectParams *params) { BLI_assert(params->rename_flag != 0); diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index 4a8e80d17bb..3aa938ee713 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -6802,7 +6802,7 @@ static void *rna_array_as_string_alloc( static void rna_array_as_string_elem(int type, void **buf_p, int len, DynStr *dynstr) { - /* This will print a comma seperated string of the array elements from + /* This will print a comma separated string of the array elements from * buf start to len. We will add a comma if len == 1 to preserve tuples. */ const int end = len - 1; if (type == PROP_BOOLEAN) { @@ -8149,8 +8149,8 @@ bool RNA_struct_equals(Main *bmain, PointerRNA *ptr_a, PointerRNA *ptr_b, eRNACo /** Generic RNA property diff function. * * \note about \a prop and \a prop_a/prop_b parameters: - * the former is exptected to be an 'un-resolved' one, - * while the two laters are expected to be fully resolved ones + * the former is expected to be an 'un-resolved' one, + * while the two later are expected to be fully resolved ones * (i.e. to be the IDProps when they should be, etc.). * When \a prop is given, \a prop_a and \a prop_b should always be NULL, and vice-versa. * This is necessary, because we cannot perform 'set/unset' checks on resolved properties @@ -8791,7 +8791,7 @@ void RNA_struct_override_apply(Main *bmain, TIMEIT_START_AVERAGED(RNA_struct_override_apply); #endif /* Note: Applying insert operations in a separate pass is mandatory. - * We could optimize this later, but for now, as inneficient as it is, + * We could optimize this later, but for now, as inefficient as it is, * don't think this is a critical point. */ bool do_insert = false; diff --git a/source/blender/render/intern/source/imagetexture.c b/source/blender/render/intern/source/imagetexture.c index 1aa16dc1019..a2a713a5591 100644 --- a/source/blender/render/intern/source/imagetexture.c +++ b/source/blender/render/intern/source/imagetexture.c @@ -514,8 +514,8 @@ static float clipy_rctf(rctf *rf, float y1, float y2) static void boxsampleclip(struct ImBuf *ibuf, rctf *rf, TexResult *texres) { - /* sample box, is clipped already, and minx etc. have been set at ibuf size. - * Enlarge with antialiased edges of the pixels */ + /* Sample box, is clipped already, and minx etc. have been set at ibuf size. + * Enlarge with anti-aliased edges of the pixels. */ float muly, mulx, div, col[4]; int x, y, startx, endx, starty, endy; |