From 84ef3b80de4915a24a9fd2fd214d0fa44e59b854 Mon Sep 17 00:00:00 2001 From: Harley Acheson Date: Mon, 19 Oct 2020 08:51:50 -0700 Subject: Spelling: Miscellaneous Corrects 34 miscellaneous misspelled words. Differential Revision: https://developer.blender.org/D9248 Reviewed by Campbell Barton --- intern/ghost/intern/GHOST_CallbackEventConsumer.h | 4 ++-- intern/itasc/kdl/utilities/error.h | 2 +- intern/itasc/kdl/utilities/error_stack.h | 2 +- intern/itasc/kdl/utilities/utility.cpp | 2 +- intern/itasc/kdl/utilities/utility.h | 2 +- intern/libmv/libmv/autotrack/autotrack.cc | 2 +- source/blender/blenkernel/BKE_subdiv_ccg.h | 2 +- source/blender/blenkernel/intern/displist.c | 2 +- source/blender/blenlib/intern/delaunay_2d.cc | 4 ++-- source/blender/blenlib/intern/math_geom.c | 2 +- source/blender/blenloader/intern/readfile.c | 2 +- source/blender/blenloader/intern/versioning_280.c | 2 +- .../blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp | 2 +- source/blender/depsgraph/intern/builder/deg_builder_nodes.cc | 2 +- source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc | 2 +- source/blender/draw/engines/gpencil/gpencil_shader_fx.c | 2 +- .../draw/engines/overlay/shaders/armature_shape_outline_vert.glsl | 2 +- .../blender/draw/engines/overlay/shaders/outline_detect_frag.glsl | 2 +- source/blender/draw/intern/shaders/common_view_lib.glsl | 2 +- source/blender/editors/interface/interface_handlers.c | 2 +- source/blender/editors/space_file/file_ops.c | 2 +- source/blender/editors/space_view3d/view3d_select.c | 2 +- source/blender/gpu/intern/gpu_select.c | 2 +- source/blender/io/alembic/intern/abc_reader_mesh.cc | 2 +- source/blender/makesdna/DNA_key_types.h | 2 +- source/blender/makesdna/DNA_pointcache_types.h | 2 +- source/blender/makesdna/intern/makesdna.c | 2 +- source/blender/makesrna/RNA_types.h | 2 +- source/blender/sequencer/intern/sequencer.c | 6 +++--- 29 files changed, 33 insertions(+), 33 deletions(-) diff --git a/intern/ghost/intern/GHOST_CallbackEventConsumer.h b/intern/ghost/intern/GHOST_CallbackEventConsumer.h index a1664e77717..9a76f4b031f 100644 --- a/intern/ghost/intern/GHOST_CallbackEventConsumer.h +++ b/intern/ghost/intern/GHOST_CallbackEventConsumer.h @@ -36,7 +36,7 @@ class GHOST_CallbackEventConsumer : public GHOST_IEventConsumer { /** * Constructor. * \param eventCallback The call-back routine invoked. - * \param userData The data passed back though the call-back routine. + * \param userData The data passed back through the call-back routine. */ GHOST_CallbackEventConsumer(GHOST_EventCallbackProcPtr eventCallback, GHOST_TUserDataPtr userData); @@ -58,7 +58,7 @@ class GHOST_CallbackEventConsumer : public GHOST_IEventConsumer { protected: /** The call-back routine invoked. */ GHOST_EventCallbackProcPtr m_eventCallback; - /** The data passed back though the call-back routine. */ + /** The data passed back through the call-back routine. */ GHOST_TUserDataPtr m_userData; #ifdef WITH_CXX_GUARDEDALLOC diff --git a/intern/itasc/kdl/utilities/error.h b/intern/itasc/kdl/utilities/error.h index 4a0af60e8af..f2377702b9b 100644 --- a/intern/itasc/kdl/utilities/error.h +++ b/intern/itasc/kdl/utilities/error.h @@ -54,7 +54,7 @@ namespace KDL { class Error { public: /** Returns a description string describing the error. - * the returned pointer only garanteed to exists as long as + * the returned pointer only guaranteed to exists as long as * the Error object exists. */ virtual ~Error() {} diff --git a/intern/itasc/kdl/utilities/error_stack.h b/intern/itasc/kdl/utilities/error_stack.h index 2ed20ea2245..95ccc2d83eb 100644 --- a/intern/itasc/kdl/utilities/error_stack.h +++ b/intern/itasc/kdl/utilities/error_stack.h @@ -32,7 +32,7 @@ * ORO_Geometry V0.2 * * \par history - * - changed layout of the comments to accomodate doxygen + * - changed layout of the comments to accommodate doxygen */ #ifndef ERROR_STACK_H #define ERROR_STACK_H diff --git a/intern/itasc/kdl/utilities/utility.cpp b/intern/itasc/kdl/utilities/utility.cpp index 031d69c8d2a..5fc8403bdb7 100644 --- a/intern/itasc/kdl/utilities/utility.cpp +++ b/intern/itasc/kdl/utilities/utility.cpp @@ -7,7 +7,7 @@ * ORO_Geometry V0.2 * * @par history - * - changed layout of the comments to accomodate doxygen + * - changed layout of the comments to accommodate doxygen */ #include "utility.h" diff --git a/intern/itasc/kdl/utilities/utility.h b/intern/itasc/kdl/utilities/utility.h index 6d0ec7a6eb7..d0e66bade20 100644 --- a/intern/itasc/kdl/utilities/utility.h +++ b/intern/itasc/kdl/utilities/utility.h @@ -14,7 +14,7 @@ * functions and macro definitions. * * \par history - * - changed layout of the comments to accomodate doxygen + * - changed layout of the comments to accommodate doxygen */ diff --git a/intern/libmv/libmv/autotrack/autotrack.cc b/intern/libmv/libmv/autotrack/autotrack.cc index 00366e0f661..3b0a762178a 100644 --- a/intern/libmv/libmv/autotrack/autotrack.cc +++ b/intern/libmv/libmv/autotrack/autotrack.cc @@ -130,7 +130,7 @@ bool AutoTrack::TrackMarker(Marker* tracked_marker, // Try to predict the location of the second marker. bool predicted_position = false; if (PredictMarkerPosition(tracks_, tracked_marker)) { - LG << "Succesfully predicted!"; + LG << "Successfully predicted!"; predicted_position = true; } else { LG << "Prediction failed; trying to track anyway."; diff --git a/source/blender/blenkernel/BKE_subdiv_ccg.h b/source/blender/blenkernel/BKE_subdiv_ccg.h index 7833ba9c046..f0ca154c4b9 100644 --- a/source/blender/blenkernel/BKE_subdiv_ccg.h +++ b/source/blender/blenkernel/BKE_subdiv_ccg.h @@ -333,7 +333,7 @@ SubdivCCGAdjacencyType BKE_subdiv_ccg_coarse_mesh_adjacency_info_get(const Subdi /* Get array which is indexed by face index and contains index of a first grid of the face. * - * The "ensure" version allocates the mapping if it's not know yet and stores it in the subdiv_ccg + * The "ensure" version allocates the mapping if it's not known yet and stores it in the subdiv_ccg * descriptor. This function is NOT safe for threading. * * The "get" version simply returns cached array. */ diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index c37da9a9365..bcb467e1230 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/source/blender/blenkernel/intern/displist.c @@ -1172,7 +1172,7 @@ static void curve_calc_modifiers_post(Depsgraph *depsgraph, } } else if (modified != NULL) { - /* Prety stupid to generate that whole mesh if it's unused, yet we have to free it. */ + /* Pretty stupid to generate that whole mesh if it's unused, yet we have to free it. */ BKE_id_free(NULL, modified); } } diff --git a/source/blender/blenlib/intern/delaunay_2d.cc b/source/blender/blenlib/intern/delaunay_2d.cc index 7b0f6a658ce..ac3662284d0 100644 --- a/source/blender/blenlib/intern/delaunay_2d.cc +++ b/source/blender/blenlib/intern/delaunay_2d.cc @@ -1031,7 +1031,7 @@ void dc_tri(CDTArrangement *cdt, } return; } - /* Recursive case. Do left (L) and right (R) halves seperately, then join. */ + /* Recursive case. Do left (L) and right (R) halves separately, then join. */ int n2 = n / 2; BLI_assert(n2 >= 2 && end - (start + n2) >= 2); SymEdge *ldo; @@ -1308,7 +1308,7 @@ template inline int tri_orient(const SymEdge *t) * For case (a), 'vert' will be the vertex, and lambda will be 0, and 'in' will be the #SymEdge * from 'vert' that has as face the one that you go through to get to this vertex. If you go * exactly along an edge then we set 'in' to NULL, since it won't be needed. The first crossing - * will have 'in' = NULL. We set 'out' to the #SymEdge that has the face we go though to get to the + * will have 'in' = NULL. We set 'out' to the #SymEdge that has the face we go through to get to the * next crossing, or, if the next crossing is a case (a), then it is the edge that goes to that * next vertex. 'out' will be NULL for the last one. * diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c index 01a6a12066d..2f913a294e0 100644 --- a/source/blender/blenlib/intern/math_geom.c +++ b/source/blender/blenlib/intern/math_geom.c @@ -3408,7 +3408,7 @@ float line_plane_factor_v3(const float plane_co[3], /** * Ensure the distance between these points is no greater than 'dist'. - * If it is, scale then both into the center. + * If it is, scale them both into the center. */ void limit_dist_v3(float v1[3], float v2[3], const float dist) { diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index c5d805e6448..24bbb50968a 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -1681,7 +1681,7 @@ bool BLO_library_path_explode(const char *path, char *r_dir, char **r_group, cha { /* We might get some data names with slashes, * so we have to go up in path until we find blend file itself, - * then we now next path item is group, and everything else is data name. */ + * then we know next path item is group, and everything else is data name. */ char *slash = NULL, *prev_slash = NULL, c = '\0'; r_dir[0] = '\0'; diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index c44e9b5efff..8e082f1c0f9 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -890,7 +890,7 @@ static void do_versions_material_convert_legacy_blend_mode(bNodeTree *ntree, cha bNodeSocket *color_socket = nodeFindSocket(transp_node, SOCK_IN, "Color"); bNodeSocket *transp_socket = nodeFindSocket(transp_node, SOCK_OUT, "BSDF"); - /* If incomming link is from a closure socket, we need to convert it. */ + /* If incoming link is from a closure socket, we need to convert it. */ if (fromsock->type == SOCK_SHADER) { transp_node->locx = 0.33f * fromnode->locx + 0.66f * tonode->locx; transp_node->locy = 0.33f * fromnode->locy + 0.66f * tonode->locy; diff --git a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp index 571061c8c0e..95ccb462ade 100644 --- a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp +++ b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp @@ -1088,7 +1088,7 @@ static void do_fillGradientBuffer(unsigned int rw, * * 1.) Loop through all gradient pixels. * A.) For each gradient pixel: - * a.) Loop though all outside edge pixels, looking for closest one + * a.) Loop through all outside edge pixels, looking for closest one * to the gradient pixel we are in. * b.) Loop through all inside edge pixels, looking for closest one * to the gradient pixel we are in. diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index c245c67d1cd..7f9a745c1a4 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -511,7 +511,7 @@ void DepsgraphNodeBuilder::build_collection(LayerCollection *from_layer_collecti } else if (from_layer_collection == nullptr && !id_node->is_collection_fully_expanded) { /* Initially collection was built from layer now, and was requested - * to not recurs into object. But now it's asked to recurs into all objects. */ + * to not recurse into object. But now it's asked to recurse into all objects. */ } else { return; diff --git a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc index 0f3914c033b..477dd316768 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc @@ -1043,7 +1043,7 @@ void discard_edit_mode_pointers(ID *id_cow) /* Free content of the CoW data-block * Notes: - * - Does not recurs into nested ID data-blocks. + * - Does not recurse into nested ID data-blocks. * - Does not free data-block itself. */ void deg_free_copy_on_write_datablock(ID *id_cow) { diff --git a/source/blender/draw/engines/gpencil/gpencil_shader_fx.c b/source/blender/draw/engines/gpencil/gpencil_shader_fx.c index bf146add19d..d01aaaed8b0 100644 --- a/source/blender/draw/engines/gpencil/gpencil_shader_fx.c +++ b/source/blender/draw/engines/gpencil/gpencil_shader_fx.c @@ -586,7 +586,7 @@ void gpencil_vfx_cache_populate(GPENCIL_Data *vedata, Object *ob, GPENCIL_tObjec GPENCIL_FramebufferList *fbl = vedata->fbl; GPENCIL_PrivateData *pd = vedata->stl->pd; - /* These may not be allocated yet, use adress of future pointer. */ + /* These may not be allocated yet, use address of future pointer. */ gpIterVfxData iter = { .pd = pd, .tgp_ob = tgp_ob, diff --git a/source/blender/draw/engines/overlay/shaders/armature_shape_outline_vert.glsl b/source/blender/draw/engines/overlay/shaders/armature_shape_outline_vert.glsl index b720be0c7d1..45ebad0aafe 100644 --- a/source/blender/draw/engines/overlay/shaders/armature_shape_outline_vert.glsl +++ b/source/blender/draw/engines/overlay/shaders/armature_shape_outline_vert.glsl @@ -38,7 +38,7 @@ void main() mat3 normal_mat = transpose(inverse(mat3(model_mat))); /* TODO FIX: there is still a problem with this vector * when the bone is scaled or in persp mode. But it's - * barelly visible at the outline corners. */ + * barely visible at the outline corners. */ ssNor = normalize(normal_world_to_view(normal_mat * snor).xy); ssPos = proj(pPos); diff --git a/source/blender/draw/engines/overlay/shaders/outline_detect_frag.glsl b/source/blender/draw/engines/overlay/shaders/outline_detect_frag.glsl index c77c89396af..1c54076f3ea 100644 --- a/source/blender/draw/engines/overlay/shaders/outline_detect_frag.glsl +++ b/source/blender/draw/engines/overlay/shaders/outline_detect_frag.glsl @@ -124,7 +124,7 @@ void straight_line_dir(bvec4 edges1, bvec4 edges2, out vec2 line_start, out vec2 vec2 diag_offset(bvec4 edges) { /* X_NEG | Y_POS as reference. Other cases are rotated to match reference. - * So the line is comming from bottom left. */ + * So the line is coming from bottom left. */ if (all(edges.wz)) { /* Horizontal line. */ return vec2(2.5, 0.5); diff --git a/source/blender/draw/intern/shaders/common_view_lib.glsl b/source/blender/draw/intern/shaders/common_view_lib.glsl index 73c112fe3fb..ff085094a18 100644 --- a/source/blender/draw/intern/shaders/common_view_lib.glsl +++ b/source/blender/draw/intern/shaders/common_view_lib.glsl @@ -168,7 +168,7 @@ uniform mat4 ModelMatrixInverse; #define resource_handle (resourceChunk * DRW_RESOURCE_CHUNK_LEN + resource_id) /** Transform shortcuts. */ -/* Rule of thumb: Try to reuse world positions and normals because converting though viewspace +/* Rule of thumb: Try to reuse world positions and normals because converting through viewspace * will always be decomposed in at least 2 matrix operation. */ /** diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 0cc1932d88c..95bb27d9fca 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -1433,7 +1433,7 @@ static int ui_drag_toggle_but_pushed_state(bContext *C, uiBut *but) return but->pushed_state_func(C, but->pushed_state_arg); } /* Assume icon identifies a unique state, for buttons that - * work though functions callbacks and don't have an boolean + * work through functions callbacks and don't have an boolean * value that indicates the state. */ return but->icon + but->iconadd; } diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c index 7bbf27c1f1e..91653fb7785 100644 --- a/source/blender/editors/space_file/file_ops.c +++ b/source/blender/editors/space_file/file_ops.c @@ -2415,7 +2415,7 @@ void file_directory_enter_handle(bContext *C, void *UNUSED(arg_unused), void *UN WM_operator_properties_create_ptr(&ptr, ot); RNA_string_set(&ptr, "directory", sfile->params->dir); RNA_boolean_set(&ptr, "open", true); - /* Enable confirmation prompt, else it's too easy to accidentaly create new directories. */ + /* Enable confirmation prompt, else it's too easy to accidentally create new directories. */ RNA_boolean_set(&ptr, "confirm", true); if (lastdir) { diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index 3f758c0fda3..5b400bbf60a 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -1693,7 +1693,7 @@ static int selectbuffer_ret_hits_5(uint *buffer, * Checks three selection levels and compare. * * \param do_nearest_xray_if_supported: When set, read in hits that don't stop - * at the nearest surface. The hit's must still be ordered by depth. + * at the nearest surface. The hits must still be ordered by depth. * Needed so we can step to the next, non-active object when it's already selected, see: T76445. */ static int mixed_bones_object_selectbuffer(ViewContext *vc, diff --git a/source/blender/gpu/intern/gpu_select.c b/source/blender/gpu/intern/gpu_select.c index c069cbe012f..88b704a84a1 100644 --- a/source/blender/gpu/intern/gpu_select.c +++ b/source/blender/gpu/intern/gpu_select.c @@ -192,7 +192,7 @@ bool GPU_select_is_cached(void) */ /** - * Helper function, nothing special but avoids doing inline since hit's aren't sorted by depth + * Helper function, nothing special but avoids doing inline since hits aren't sorted by depth * and purpose of 4x buffer indices isn't so clear. * * Note that comparing depth as uint is fine. diff --git a/source/blender/io/alembic/intern/abc_reader_mesh.cc b/source/blender/io/alembic/intern/abc_reader_mesh.cc index 31a8cf46fa7..28e42b1f70f 100644 --- a/source/blender/io/alembic/intern/abc_reader_mesh.cc +++ b/source/blender/io/alembic/intern/abc_reader_mesh.cc @@ -261,7 +261,7 @@ static void read_mpolys(CDStreamConfig &config, const AbcMeshData &mesh_data) static void process_no_normals(CDStreamConfig &config) { - /* Absense of normals in the Alembic mesh is interpreted as 'smooth'. */ + /* Absence of normals in the Alembic mesh is interpreted as 'smooth'. */ BKE_mesh_calc_normals(config.mesh); } diff --git a/source/blender/makesdna/DNA_key_types.h b/source/blender/makesdna/DNA_key_types.h index 782827578c2..3a613d92e4f 100644 --- a/source/blender/makesdna/DNA_key_types.h +++ b/source/blender/makesdna/DNA_key_types.h @@ -107,7 +107,7 @@ typedef struct Key { char _pad2; /** Only used when (Key->type == KEY_NORMAL), this value is used as a time slider, - * rather than using the scenes time, this value can be animated to give greater control */ + * rather than using the scene's time, this value can be animated to give greater control */ float ctime; /** diff --git a/source/blender/makesdna/DNA_pointcache_types.h b/source/blender/makesdna/DNA_pointcache_types.h index ff899165284..79d46ffe112 100644 --- a/source/blender/makesdna/DNA_pointcache_types.h +++ b/source/blender/makesdna/DNA_pointcache_types.h @@ -78,7 +78,7 @@ typedef struct PointCache { /** * The number of frames between cached frames. * This should probably be an upper bound for a per point adaptive step in the future, - * buf for now it's the same for all points. Without adaptivity this can effect the perceived + * but for now it's the same for all points. Without adaptivity this can effect the perceived * simulation quite a bit though. If for example particles are colliding with a horizontal * plane (with high damping) they quickly come to a stop on the plane, however there are still * forces acting on the particle (gravity and collisions), so the particle velocity isn't diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index f0c7d2549ca..44b6e4dd3a1 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -507,7 +507,7 @@ static int add_name(const char *str) buf[i + 2] = ')'; buf[i + 3] = 0; } - /* now precede with buf*/ + /* now proceed with buf*/ DEBUG_PRINTF(3, "\t\t\t\t\tProposing fp name %s\n", buf); name = buf; } diff --git a/source/blender/makesrna/RNA_types.h b/source/blender/makesrna/RNA_types.h index d63a2e06764..110497cd0a4 100644 --- a/source/blender/makesrna/RNA_types.h +++ b/source/blender/makesrna/RNA_types.h @@ -667,7 +667,7 @@ typedef struct BlenderRNA BlenderRNA; * Extending * * This struct must be embedded in *Type structs in - * order to make then definable through RNA. + * order to make them definable through RNA. */ typedef struct ExtensionRNA { void *data; diff --git a/source/blender/sequencer/intern/sequencer.c b/source/blender/sequencer/intern/sequencer.c index 473f008bd9c..6f5774d97fa 100644 --- a/source/blender/sequencer/intern/sequencer.c +++ b/source/blender/sequencer/intern/sequencer.c @@ -4357,8 +4357,8 @@ void BKE_sequencer_free_imbuf(Scene *scene, ListBase *seqbase, bool for_render) BKE_sequencer_free_imbuf(scene, &seq->seqbase, for_render); } if (seq->type == SEQ_TYPE_SCENE) { - /* FIXME: recurs downwards, - * but do recurs protection somehow! */ + /* FIXME: recurse downwards, + * but do recurse protection somehow! */ } } } @@ -4369,7 +4369,7 @@ static bool update_changed_seq_recurs( Sequence *subseq; bool free_imbuf = false; - /* recurs downwards to see if this seq depends on the changed seq */ + /* recurse downwards to see if this seq depends on the changed seq */ if (seq == NULL) { return false; -- cgit v1.2.3