From 63ccb2630385958f4f1535513e5541ba3b41bb9e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 17 Jan 2014 17:35:03 +1100 Subject: [PATCH] Code Cleanup: spelling --- intern/cycles/render/graph.cpp | 4 ++-- source/blender/blenkernel/depsgraph_private.h | 2 +- source/blender/blenkernel/intern/depsgraph.c | 2 +- source/blender/blenkernel/intern/font.c | 2 +- source/blender/blenkernel/intern/mask.c | 2 +- source/blender/blenkernel/intern/mesh_validate.c | 2 +- source/blender/blenkernel/intern/scene.c | 2 +- source/blender/blenkernel/intern/shrinkwrap.c | 4 ++-- source/blender/blenkernel/intern/tracking_stabilize.c | 4 ++-- source/blender/bmesh/operators/bmo_wireframe.c | 2 +- source/blender/bmesh/tools/bmesh_wireframe.c | 2 +- source/blender/editors/metaball/mball_edit.c | 2 +- source/blender/editors/transform/transform.c | 2 +- source/blender/makesdna/DNA_scene_types.h | 2 +- source/blender/modifiers/intern/MOD_build.c | 2 +- source/blender/python/mathutils/mathutils_Matrix.c | 2 +- source/blender/windowmanager/intern/wm_operators.c | 2 +- 17 files changed, 20 insertions(+), 20 deletions(-) diff --git a/intern/cycles/render/graph.cpp b/intern/cycles/render/graph.cpp index 3fae5244488..9142eb5308c 100644 --- a/intern/cycles/render/graph.cpp +++ b/intern/cycles/render/graph.cpp @@ -614,11 +614,11 @@ void ShaderGraph::refine_bump_nodes() foreach(NodePair& pair, nodes_dy) add(pair.second); - /* connect what is conected is bump to samplecenter input*/ + /* connect what is connected is bump to samplecenter input*/ connect(out , node->input("SampleCenter")); /* bump input is just for connectivity purpose for the graph input, - * we reconected this input to samplecenter, so lets disconnect it + * we re-connected this input to samplecenter, so lets disconnect it * from bump input */ disconnect(bump_input); } diff --git a/source/blender/blenkernel/depsgraph_private.h b/source/blender/blenkernel/depsgraph_private.h index bf0179a4911..e61d47e87f4 100644 --- a/source/blender/blenkernel/depsgraph_private.h +++ b/source/blender/blenkernel/depsgraph_private.h @@ -122,7 +122,7 @@ typedef struct DagNodeQueue { struct DagNodeQueue *freenodes; } DagNodeQueue; -// forest as we may have more than one DAG unnconected +/* forest as we may have more than one DAG unconnected */ typedef struct DagForest { ListBase DagNode; struct GHash *nodeHash; diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c index b9c9572d599..0f6be44a1ee 100644 --- a/source/blender/blenkernel/intern/depsgraph.c +++ b/source/blender/blenkernel/intern/depsgraph.c @@ -2229,7 +2229,7 @@ static void dag_id_flush_update(Main *bmain, Scene *sce, ID *id) BKE_ptcache_object_reset(sce, ob, PTCACHE_RESET_DEPSGRAPH); /* So if someone tagged object recalc directly, - * id_tag_update biffield stays relevant + * id_tag_update bit-field stays relevant */ if (ob->recalc & OB_RECALC_ALL) { DAG_id_type_tag(bmain, GS(id->name)); diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c index 0b990d21e5f..3a1ed70edbc 100644 --- a/source/blender/blenkernel/intern/font.c +++ b/source/blender/blenkernel/intern/font.c @@ -184,7 +184,7 @@ static VFontData *vfont_get_data(Main *bmain, VFont *vfont) printf("Font file doesn't exist: %s\n", vfont->name); /* DON'T DO THIS - * missing file shouldn't modifty path! - campbell */ + * missing file shouldn't modify path! - campbell */ #if 0 strcpy(vfont->name, FO_BUILTIN_NAME); #endif diff --git a/source/blender/blenkernel/intern/mask.c b/source/blender/blenkernel/intern/mask.c index 2b81034f1a0..a129f724d3e 100644 --- a/source/blender/blenkernel/intern/mask.c +++ b/source/blender/blenkernel/intern/mask.c @@ -1197,7 +1197,7 @@ void BKE_mask_get_handle_point_adjacent(MaskSpline *spline, MaskSplinePoint *poi *r_point_next = mask_spline_point_next(spline, points_array, point); } -/* calculates the tanget of a point by its previous and next +/* calculates the tangent of a point by its previous and next * (ignoring handles - as if its a poly line) */ void BKE_mask_calc_tangent_polyline(MaskSpline *spline, MaskSplinePoint *point, float t[2]) { diff --git a/source/blender/blenkernel/intern/mesh_validate.c b/source/blender/blenkernel/intern/mesh_validate.c index ad6a2de31cd..7b56784b1dd 100644 --- a/source/blender/blenkernel/intern/mesh_validate.c +++ b/source/blender/blenkernel/intern/mesh_validate.c @@ -450,7 +450,7 @@ bool BKE_mesh_validate_arrays(Mesh *mesh, # undef CHECK_FACE_EDGE } - /* Checking loops and polys is a bit tricky, as they are quite intricated... + /* Checking loops and polys is a bit tricky, as they are quite intricate... * * Polys must have: * - a valid loopstart value. diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 8b3866076be..da8700d316a 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -1271,7 +1271,7 @@ static void scene_update_object_func(TaskPool *pool, void *taskdata, int threadi /* We only update object itself here, dupli-group will be updated * separately from main thread because of we've got no idea about - * dependnecies inside the group. + * dependencies inside the group. */ BKE_object_handle_update_ex(eval_ctx, scene_parent, object, scene->rigidbody_world); diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c index 6a7c16d1162..49c36566b36 100644 --- a/source/blender/blenkernel/intern/shrinkwrap.c +++ b/source/blender/blenkernel/intern/shrinkwrap.c @@ -165,7 +165,7 @@ static void shrinkwrap_calc_nearest_vertex(ShrinkwrapCalcData *calc) * * If we already had an hit before.. we assume this vertex is going to have a close hit to that other vertex * so we can initiate the "nearest.dist" with the expected value to that last hit. - * This will lead in prunning of the search tree. */ + * This will lead in pruning of the search tree. */ if (nearest.index != -1) nearest.dist = len_squared_v3v3(tmp_co, nearest.co); else @@ -467,7 +467,7 @@ static void shrinkwrap_calc_nearest_surface_point(ShrinkwrapCalcData *calc) * * If we already had an hit before.. we assume this vertex is going to have a close hit to that other vertex * so we can initiate the "nearest.dist" with the expected value to that last hit. - * This will lead in prunning of the search tree. */ + * This will lead in pruning of the search tree. */ if (nearest.index != -1) nearest.dist = len_squared_v3v3(tmp_co, nearest.co); else diff --git a/source/blender/blenkernel/intern/tracking_stabilize.c b/source/blender/blenkernel/intern/tracking_stabilize.c index 23e59daf585..567386733a3 100644 --- a/source/blender/blenkernel/intern/tracking_stabilize.c +++ b/source/blender/blenkernel/intern/tracking_stabilize.c @@ -427,8 +427,8 @@ void BKE_tracking_stabilization_data_to_mat4(int width, int height, float aspect /* image center as rotation center * - * Rotation matrix is constructing in a way rotaion happens around image center, - * and it's matter of calculating trasnlation in a way, that applying translation + * Rotation matrix is constructing in a way rotation happens around image center, + * and it's matter of calculating translation in a way, that applying translation * after rotation would make it so rotation happens around median point of tracks * used for translation stabilization. */ diff --git a/source/blender/bmesh/operators/bmo_wireframe.c b/source/blender/bmesh/operators/bmo_wireframe.c index 83d6e3ad36a..62409fc3987 100644 --- a/source/blender/bmesh/operators/bmo_wireframe.c +++ b/source/blender/bmesh/operators/bmo_wireframe.c @@ -23,7 +23,7 @@ /** \file blender/bmesh/operators/bmo_wireframe.c * \ingroup bmesh * - * Creates a solid wireframe from conected faces. + * Creates a solid wireframe from connected faces. */ #include "MEM_guardedalloc.h" diff --git a/source/blender/bmesh/tools/bmesh_wireframe.c b/source/blender/bmesh/tools/bmesh_wireframe.c index 012282f5bad..db4601d6134 100644 --- a/source/blender/bmesh/tools/bmesh_wireframe.c +++ b/source/blender/bmesh/tools/bmesh_wireframe.c @@ -23,7 +23,7 @@ /** \file blender/bmesh/operators/bmesh_wireframe.c * \ingroup bmesh * - * Creates a solid wireframe from conected faces. + * Creates a solid wireframe from connected faces. */ #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/metaball/mball_edit.c b/source/blender/editors/metaball/mball_edit.c index 04cd7c34010..32a4adb11a6 100644 --- a/source/blender/editors/metaball/mball_edit.c +++ b/source/blender/editors/metaball/mball_edit.c @@ -91,7 +91,7 @@ void make_editMball(Object *obedit) } /* This function is called, when MetaBall Object switched from - * edit mode to object mode. List od MetaElements is copied + * edit mode to object mode. List of MetaElements is copied * from object->data->edit_elems to object->data->elems. */ void load_editMball(Object *UNUSED(obedit)) { diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index a73063ff05e..68fe1c42414 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -5140,7 +5140,7 @@ static bool bm_loop_calc_opposite_co(BMLoop *l_tmp, const float fac = line_point_factor_v3(tvec, l_iter->v->co, l_iter->next->v->co); /* allow some overlap to avoid missing the intersection because of float precision */ if ((fac > -FLT_EPSILON) && (fac < 1.0f + FLT_EPSILON)) { - /* likelyhood of multiple intersections per ngon is quite low, + /* likelihood of multiple intersections per ngon is quite low, * it would have to loop back on its self, but better support it * so check for the closest opposite edge */ const float tdist = len_v3v3(l_tmp->v->co, tvec); diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 9fb3135c8a5..d36387b6664 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -956,7 +956,7 @@ typedef enum { UNIFIED_PAINT_ALPHA = (1 << 1), UNIFIED_PAINT_WEIGHT = (1 << 5), - /* only used if unified size is enabled, mirros the brush flags + /* only used if unified size is enabled, mirrors the brush flags * BRUSH_LOCK_SIZE and BRUSH_SIZE_PRESSURE */ UNIFIED_PAINT_BRUSH_LOCK_SIZE = (1 << 2), UNIFIED_PAINT_BRUSH_SIZE_PRESSURE = (1 << 3), diff --git a/source/blender/modifiers/intern/MOD_build.c b/source/blender/modifiers/intern/MOD_build.c index 58fcbf76e8d..ab9c15f88db 100644 --- a/source/blender/modifiers/intern/MOD_build.c +++ b/source/blender/modifiers/intern/MOD_build.c @@ -121,7 +121,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob), CLAMP(frac, 0.0f, 1.0f); if (bmd->flag & MOD_BUILD_FLAG_REVERSE) { - frac = 1.0 - frac; + frac = 1.0f - frac; } numFaces_dst = numPoly_src * frac; diff --git a/source/blender/python/mathutils/mathutils_Matrix.c b/source/blender/python/mathutils/mathutils_Matrix.c index 6965d96f5f0..aa035aa05a6 100644 --- a/source/blender/python/mathutils/mathutils_Matrix.c +++ b/source/blender/python/mathutils/mathutils_Matrix.c @@ -1368,7 +1368,7 @@ static PyObject *Matrix_rotate(MatrixObject *self, PyObject *value) PyDoc_STRVAR(Matrix_decompose_doc, ".. method:: decompose()\n" "\n" -" Return the location, rotaion and scale components of this matrix.\n" +" Return the location, rotation and scale components of this matrix.\n" "\n" " :return: loc, rot, scale triple.\n" " :rtype: (:class:`Vector`, :class:`Quaternion`, :class:`Vector`)" diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 146378a348f..f5e4b9ae310 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -2728,7 +2728,7 @@ static int wm_save_mainfile_invoke(bContext *C, wmOperator *op, const wmEvent *U RNA_string_set(op->ptr, "filepath", name); - /* if we're saving for the first time and prefer relative paths - any existign paths will be absolute, + /* if we're saving for the first time and prefer relative paths - any existing paths will be absolute, * enable the option to remap paths to avoid confusion [#37240] */ if ((G.relbase_valid == false) && (U.flag & USER_RELPATHS)) { PropertyRNA *prop = RNA_struct_find_property(op->ptr, "relative_remap");