Commit: 84ef3b80de4915a24a9fd2fd214d0fa44e59b854 Author: Harley Acheson Date: Mon Oct 19 08:51:50 2020 -0700 Branches: master https://developer.blender.org/rB84ef3b80de4915a24a9fd2fd214d0fa44e59b854
Spelling: Miscellaneous Corrects 34 miscellaneous misspelled words. Differential Revision: https://developer.blender.org/D9248 Reviewed by Campbell Barton =================================================================== M intern/ghost/intern/GHOST_CallbackEventConsumer.h M intern/itasc/kdl/utilities/error.h M intern/itasc/kdl/utilities/error_stack.h M intern/itasc/kdl/utilities/utility.cpp M intern/itasc/kdl/utilities/utility.h M intern/libmv/libmv/autotrack/autotrack.cc M source/blender/blenkernel/BKE_subdiv_ccg.h M source/blender/blenkernel/intern/displist.c M source/blender/blenlib/intern/delaunay_2d.cc M source/blender/blenlib/intern/math_geom.c M source/blender/blenloader/intern/readfile.c M source/blender/blenloader/intern/versioning_280.c M source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp M source/blender/depsgraph/intern/builder/deg_builder_nodes.cc M source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc M source/blender/draw/engines/gpencil/gpencil_shader_fx.c M source/blender/draw/engines/overlay/shaders/armature_shape_outline_vert.glsl M source/blender/draw/engines/overlay/shaders/outline_detect_frag.glsl M source/blender/draw/intern/shaders/common_view_lib.glsl M source/blender/editors/interface/interface_handlers.c M source/blender/editors/space_file/file_ops.c M source/blender/editors/space_view3d/view3d_select.c M source/blender/gpu/intern/gpu_select.c M source/blender/io/alembic/intern/abc_reader_mesh.cc M source/blender/makesdna/DNA_key_types.h M source/blender/makesdna/DNA_pointcache_types.h M source/blender/makesdna/intern/makesdna.c M source/blender/makesrna/RNA_types.h M source/blender/sequencer/intern/sequencer.c =================================================================== 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<T> *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<T> *ldo; @@ -1308,7 +1308,7 @@ template<typename T> inline int tri_orient(const SymEdge<T> *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 + @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs