From a6a0a091978d09ffa85306dcabb671370a5bb322 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 30 Sep 2019 17:06:28 +1000 Subject: Cleanup: spelling --- source/blender/blenkernel/BKE_gpencil_modifier.h | 2 +- source/blender/blenkernel/BKE_subdiv.h | 2 +- source/blender/blenkernel/BKE_subdiv_ccg.h | 2 +- source/blender/blenkernel/intern/appdir.c | 2 +- source/blender/blenkernel/intern/node.c | 6 +++--- source/blender/blenkernel/intern/seqcache.c | 2 +- source/blender/blenlib/BLI_sort.h | 2 +- source/blender/blenlib/intern/BLI_linklist.c | 2 +- source/blender/blenlib/intern/listbase.c | 2 +- source/blender/blenlib/intern/math_matrix.c | 4 ++-- source/blender/blenlib/intern/sort.c | 2 +- source/blender/depsgraph/DEG_depsgraph_query.h | 2 +- source/blender/draw/intern/draw_manager_data.c | 4 ++-- source/blender/editors/physics/particle_edit.c | 2 +- source/blender/editors/space_node/drawnode.c | 2 +- source/blender/makesdna/DNA_movieclip_types.h | 2 +- source/blender/makesdna/DNA_node_types.h | 2 +- source/blender/nodes/shader/node_shader_tree.c | 2 +- source/blender/python/generic/idprop_py_api.c | 2 +- source/blender/python/intern/bpy_rna.c | 6 +++--- source/blender/python/mathutils/mathutils_Vector.c | 18 +++++++++--------- 21 files changed, 35 insertions(+), 35 deletions(-) (limited to 'source') diff --git a/source/blender/blenkernel/BKE_gpencil_modifier.h b/source/blender/blenkernel/BKE_gpencil_modifier.h index eb2279c4f48..918f85d146c 100644 --- a/source/blender/blenkernel/BKE_gpencil_modifier.h +++ b/source/blender/blenkernel/BKE_gpencil_modifier.h @@ -31,7 +31,7 @@ struct ModifierUpdateDepsgraphContext; struct Object; struct Scene; /* NOTE: bakeModifier() called from UI: - * needs to create new databloc-ks, hence the need for this. */ + * needs to create new data-blocks, hence the need for this. */ struct bGPDframe; struct bGPDlayer; struct bGPDstroke; diff --git a/source/blender/blenkernel/BKE_subdiv.h b/source/blender/blenkernel/BKE_subdiv.h index 700bf5139e0..267a03da25c 100644 --- a/source/blender/blenkernel/BKE_subdiv.h +++ b/source/blender/blenkernel/BKE_subdiv.h @@ -140,7 +140,7 @@ typedef struct SubdivDisplacement { /* This structure contains everything needed to construct subdivided surface. * It does not specify storage, memory layout or anything else. - * It is possible to create different storages (like, grid based CPU side + * It is possible to create different storage's (like, grid based CPU side * buffers, GPU subdivision mesh, CPU side fully qualified mesh) from the same * Subdiv structure. */ typedef struct Subdiv { diff --git a/source/blender/blenkernel/BKE_subdiv_ccg.h b/source/blender/blenkernel/BKE_subdiv_ccg.h index 2e9ccb8b39d..e235193a486 100644 --- a/source/blender/blenkernel/BKE_subdiv_ccg.h +++ b/source/blender/blenkernel/BKE_subdiv_ccg.h @@ -150,7 +150,7 @@ typedef struct SubdivCCG { struct CCGElem **edges; int num_edges; /* Loose vertices. Every element corresponds to a loose vertex from a coarse - * mesh, every coarse loose vertex corresponds to a single sundivided + * mesh, every coarse loose vertex corresponds to a single subdivided * element. */ struct CCGElem *vertices; int num_vertices; diff --git a/source/blender/blenkernel/intern/appdir.c b/source/blender/blenkernel/intern/appdir.c index 3b64a9520ca..fbac9e6b773 100644 --- a/source/blender/blenkernel/intern/appdir.c +++ b/source/blender/blenkernel/intern/appdir.c @@ -110,7 +110,7 @@ const char *BKE_appdir_folder_default(void) // #define PATH_DEBUG -/* returns a formatted representation of the specified version number. Non-reentrant! */ +/* returns a formatted representation of the specified version number. Non-re-entrant! */ static char *blender_version_decimal(const int ver) { static char version_str[5]; diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index 6e45130ce44..92c15e05aee 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -3348,7 +3348,7 @@ void ntreeUpdateTree(Main *bmain, bNodeTree *ntree) return; } - /* avoid reentrant updates, can be caused by RNA update callbacks */ + /* Avoid re-entrant updates, can be caused by RNA update callbacks. */ if (ntree->is_updating) { return; } @@ -3409,7 +3409,7 @@ void ntreeUpdateTree(Main *bmain, bNodeTree *ntree) void nodeUpdate(bNodeTree *ntree, bNode *node) { - /* avoid reentrant updates, can be caused by RNA update callbacks */ + /* Avoid re-entrant updates, can be caused by RNA update callbacks. */ if (ntree->is_updating) { return; } @@ -3436,7 +3436,7 @@ bool nodeUpdateID(bNodeTree *ntree, ID *id) return changed; } - /* avoid reentrant updates, can be caused by RNA update callbacks */ + /* Avoid re-entrant updates, can be caused by RNA update callbacks. */ if (ntree->is_updating) { return changed; } diff --git a/source/blender/blenkernel/intern/seqcache.c b/source/blender/blenkernel/intern/seqcache.c index 35693fbe679..d12710690df 100644 --- a/source/blender/blenkernel/intern/seqcache.c +++ b/source/blender/blenkernel/intern/seqcache.c @@ -241,7 +241,7 @@ static SeqCacheKey *seq_cache_choose_key(Scene *scene, SeqCacheKey *lkey, SeqCac * This can happen because only FINAL_OUT item insertion will trigger recycling * but that is also the point, where prefetch can be suspended. * - * We could use temp cache as a shield and later untemp entry, + * We could use temp cache as a shield and later make it a non-temporary entry, * but it is not worth of increasing system complexity. */ if (scene->ed->cache_flag & SEQ_CACHE_PREFETCH_ENABLE) { diff --git a/source/blender/blenlib/BLI_sort.h b/source/blender/blenlib/BLI_sort.h index b6250afdee0..08e61915a83 100644 --- a/source/blender/blenlib/BLI_sort.h +++ b/source/blender/blenlib/BLI_sort.h @@ -31,7 +31,7 @@ # define BLI_qsort_r qsort_r #endif -/* Quick sort reentrant */ +/* Quick sort re-entrant */ typedef int (*BLI_sort_cmp_t)(const void *a, const void *b, void *ctx); void BLI_qsort_r(void *a, size_t n, size_t es, BLI_sort_cmp_t cmp, void *thunk) diff --git a/source/blender/blenlib/intern/BLI_linklist.c b/source/blender/blenlib/intern/BLI_linklist.c index ae4f5dcebcf..0fe9fd62198 100644 --- a/source/blender/blenlib/intern/BLI_linklist.c +++ b/source/blender/blenlib/intern/BLI_linklist.c @@ -325,7 +325,7 @@ void BLI_linklist_apply(LinkNode *list, LinkNodeApplyFP applyfunc, void *userdat #include "list_sort_impl.h" #undef SORT_IMPL_FUNC -/* reentrant call */ +/* re-entrant call */ #define SORT_IMPL_USE_THUNK #define SORT_IMPL_FUNC linklist_sort_fn_r #include "list_sort_impl.h" diff --git a/source/blender/blenlib/intern/listbase.c b/source/blender/blenlib/intern/listbase.c index 232dc245152..fe5f9f7673f 100644 --- a/source/blender/blenlib/intern/listbase.c +++ b/source/blender/blenlib/intern/listbase.c @@ -312,7 +312,7 @@ static void listbase_double_from_single(Link *iter, ListBase *listbase) #include "list_sort_impl.h" #undef SORT_IMPL_FUNC -/* reentrant call */ +/* re-entrant call */ #define SORT_IMPL_USE_THUNK #define SORT_IMPL_FUNC listbase_sort_fn_r #include "list_sort_impl.h" diff --git a/source/blender/blenlib/intern/math_matrix.c b/source/blender/blenlib/intern/math_matrix.c index e9d196ccdbb..33e272ed7eb 100644 --- a/source/blender/blenlib/intern/math_matrix.c +++ b/source/blender/blenlib/intern/math_matrix.c @@ -1146,8 +1146,8 @@ bool invert_m4(float m[4][4]) * \return true on success (i.e. can always find a pivot) and false on failure. * Mark Segal - 1992. * - * \note this is less performant than #EIG_invert_m4_m4 (Eigen), but e.g. - * for non-invertible scale matrices, findinging a partial solution can + * \note this has worse performance than #EIG_invert_m4_m4 (Eigen), but e.g. + * for non-invertible scale matrices, finding a partial solution can * be useful to have a valid local transform center, see T57767. */ bool invert_m4_m4_fallback(float inverse[4][4], const float mat[4][4]) diff --git a/source/blender/blenlib/intern/sort.c b/source/blender/blenlib/intern/sort.c index 225015db00d..4ae87fff535 100644 --- a/source/blender/blenlib/intern/sort.c +++ b/source/blender/blenlib/intern/sort.c @@ -90,7 +90,7 @@ BLI_INLINE char *med3(char *a, char *b, char *c, BLI_sort_cmp_t cmp, void *thunk } /** - * Quick sort reentrant. + * Quick sort re-entrant. */ void BLI_qsort_r(void *a, size_t n, size_t es, BLI_sort_cmp_t cmp, void *thunk) { diff --git a/source/blender/depsgraph/DEG_depsgraph_query.h b/source/blender/depsgraph/DEG_depsgraph_query.h index d72a462d8fd..fb456611b15 100644 --- a/source/blender/depsgraph/DEG_depsgraph_query.h +++ b/source/blender/depsgraph/DEG_depsgraph_query.h @@ -239,7 +239,7 @@ void DEG_foreach_dependent_ID(const Depsgraph *depsgraph, enum { /* Ignore transform solvers which depends on multiple inputs and affects final transform. * Is used for cases like snapping objects which are part of a rigid body simulation: - * without this there will be "false-positive" dependnecies between transform components of + * without this there will be "false-positive" dependencies between transform components of * objects: * * object 1 transform before solver ---> solver ------> object 1 final transform diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c index e3d4228ec33..dcf526679bf 100644 --- a/source/blender/draw/intern/draw_manager_data.c +++ b/source/blender/draw/intern/draw_manager_data.c @@ -889,8 +889,8 @@ static void drw_sculpt_get_frustum_planes(Object *ob, float planes[6][4]) DRW_view_frustum_planes_get(DRW_view_default_get(), planes); /* Transform clipping planes to object space. Transforming a plane with a - * 4x4 matrix is done by multiplying with the tranpose inverse. The inverse - * cancels out here since we transform by inverse(obmat). */ + * 4x4 matrix is done by multiplying with the transpose inverse. + * The inverse cancels out here since we transform by inverse(obmat). */ float tmat[4][4]; transpose_m4_m4(tmat, ob->obmat); for (int i = 0; i < 6; i++) { diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index f0b5b5a7e54..19402316882 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -1597,7 +1597,7 @@ void PE_update_object(Depsgraph *depsgraph, Scene *scene, Object *ob, int usefla /* Only do this for emitter particles because drawing PE_FADE_TIME is not respected in 2.8 yet * and flagging with PEK_HIDE will prevent selection. This might get restored once this is - * supported in drawing (but doesnt make much sense for hair anyways). */ + * supported in drawing (but doesn't make much sense for hair anyways). */ if (edit->psys->part->type == PART_EMITTER) { PE_hide_keys_time(scene, edit, CFRA); } diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index 4f4ea182da9..3beb12fbb2a 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -3891,7 +3891,7 @@ static void nodelink_batch_draw(SpaceNode *snode) void nodelink_batch_start(SpaceNode *UNUSED(snode)) { /* TODO: partial workaround for NVIDIA driver bug on recent GTX/RTX cards, - * that breaks instancing when using indirect drawcal (see T70011). */ + * that breaks instancing when using indirect draw-call (see T70011). */ g_batch_link.enabled = !GPU_type_matches(GPU_DEVICE_NVIDIA, GPU_OS_ANY, GPU_DRIVER_ANY); } diff --git a/source/blender/makesdna/DNA_movieclip_types.h b/source/blender/makesdna/DNA_movieclip_types.h index efda24d6e0e..8de79d9ea2b 100644 --- a/source/blender/makesdna/DNA_movieclip_types.h +++ b/source/blender/makesdna/DNA_movieclip_types.h @@ -97,7 +97,7 @@ typedef struct MovieClip { struct MovieTracking tracking; /** * Context of tracking job used to synchronize data - * like framenumber in SpaceClip clip user. + * like frame-number in SpaceClip clip user. */ void *tracking_context; diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h index 0287a1510fe..702758b51ec 100644 --- a/source/blender/makesdna/DNA_node_types.h +++ b/source/blender/makesdna/DNA_node_types.h @@ -433,7 +433,7 @@ typedef struct bNodeTree { int flag; /** Update flags. */ int update; - /** Flag to prevent reentrant update calls. */ + /** Flag to prevent re-entrant update calls. */ short is_updating; /** Generic temporary flag for recursion check (DFS/BFS). */ short done; diff --git a/source/blender/nodes/shader/node_shader_tree.c b/source/blender/nodes/shader/node_shader_tree.c index 1693a6888c3..aaab3572b8e 100644 --- a/source/blender/nodes/shader/node_shader_tree.c +++ b/source/blender/nodes/shader/node_shader_tree.c @@ -469,7 +469,7 @@ static void flatten_group_do(bNodeTree *ntree, bNode *gnode) /* Flatten group to only have a simple single tree */ static void ntree_shader_groups_flatten(bNodeTree *localtree) { - /* This is effectively recusive as the flattened groups will add + /* This is effectively recursive as the flattened groups will add * nodes at the end of the list, which will also get evaluated. */ for (bNode *node = localtree->nodes.first, *node_next; node; node = node_next) { if (ELEM(node->type, NODE_GROUP, NODE_CUSTOM_GROUP) && node->id != NULL) { diff --git a/source/blender/python/generic/idprop_py_api.c b/source/blender/python/generic/idprop_py_api.c index 16b2f2dba6d..335dea0a2b6 100644 --- a/source/blender/python/generic/idprop_py_api.c +++ b/source/blender/python/generic/idprop_py_api.c @@ -897,7 +897,7 @@ static PyObject *BPy_IDGroup_pop(BPy_IDProperty *self, PyObject *args) pyform = BPy_IDGroup_MapDataToPy(idprop); if (pyform == NULL) { - /* ok something bad happened with the pyobject, + /* ok something bad happened with the #PyObject, * so don't remove the prop from the group. if pyform is * NULL, then it already should have raised an exception.*/ return NULL; diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index 9b5a9a160ba..45a7d2dacd1 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -1928,7 +1928,7 @@ static int pyrna_py_to_prop( * layout.prop(self.properties, "filepath") * * we need to do this trick. - * if the prop is not an operator type and the pyobject is an operator, + * if the prop is not an operator type and the PyObject is an operator, * use its properties in place of itself. * * This is so bad that it is almost a good reason to do away with fake @@ -3985,7 +3985,7 @@ static PyObject *pyrna_struct_type_recast(BPy_StructRNA *self) } /** - * \note Return value is borrowed, caller must incref. + * \note Return value is borrowed, caller must #Py_INCREF. */ static PyObject *pyrna_struct_bl_rna_find_subclass_recursive(PyObject *cls, const char *id) { @@ -7192,7 +7192,7 @@ static PyObject *pyrna_srna_Subtype(StructRNA *srna) #endif /* Newclass will now have 2 ref's, ???, - * probably 1 is internal since decrefing here segfaults. */ + * probably 1 is internal since #Py_DECREF here segfaults. */ /* PyC_ObSpit("new class ref", newclass); */ diff --git a/source/blender/python/mathutils/mathutils_Vector.c b/source/blender/python/mathutils/mathutils_Vector.c index 87de0ff546e..0555c707ed3 100644 --- a/source/blender/python/mathutils/mathutils_Vector.c +++ b/source/blender/python/mathutils/mathutils_Vector.c @@ -2351,26 +2351,26 @@ static PyObject *Vector_length_squared_get(VectorObject *self, void *UNUSED(clos * * axis_dict = {} * axis_pos = {'x': 0, 'y': 1, 'z': 2, 'w': 3} - * axises = 'xyzw' - * while len(axises) >= 2: - * for axis_0 in axises: + * axis_chars = 'xyzw' + * while len(axis_chars) >= 2: + * for axis_0 in axis_chars: * axis_0_pos = axis_pos[axis_0] - * for axis_1 in axises: + * for axis_1 in axis_chars: * axis_1_pos = axis_pos[axis_1] * axis_dict[axis_0 + axis_1] = ( * '((%s | SWIZZLE_VALID_AXIS) | ' * '((%s | SWIZZLE_VALID_AXIS) << SWIZZLE_BITS_PER_AXIS))' % * (axis_0_pos, axis_1_pos)) - * if len(axises) > 2: - * for axis_2 in axises: + * if len(axis_chars) > 2: + * for axis_2 in axis_chars: * axis_2_pos = axis_pos[axis_2] * axis_dict[axis_0 + axis_1 + axis_2] = ( * '((%s | SWIZZLE_VALID_AXIS) | ' * '((%s | SWIZZLE_VALID_AXIS) << SWIZZLE_BITS_PER_AXIS) | ' * '((%s | SWIZZLE_VALID_AXIS) << (SWIZZLE_BITS_PER_AXIS * 2)))' % * (axis_0_pos, axis_1_pos, axis_2_pos)) - * if len(axises) > 3: - * for axis_3 in axises: + * if len(axis_chars) > 3: + * for axis_3 in axis_chars: * axis_3_pos = axis_pos[axis_3] * axis_dict[axis_0 + axis_1 + axis_2 + axis_3] = ( * '((%s | SWIZZLE_VALID_AXIS) | ' @@ -2380,7 +2380,7 @@ static PyObject *Vector_length_squared_get(VectorObject *self, void *UNUSED(clos * % * (axis_0_pos, axis_1_pos, axis_2_pos, axis_3_pos)) * - * axises = axises[:-1] + * axis_chars = axis_chars[:-1] * items = list(axis_dict.items()) * items.sort( * key=lambda a: a[0].replace('x', '0').replace('y', '1').replace('z', '2').replace('w', '3') -- cgit v1.2.3