From 9e96c6d05488370cd74c89b69b306da6f5e4de69 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 5 Jun 2020 14:34:00 +1000 Subject: Cleanup: spelling --- source/blender/blenkernel/BKE_modifier.h | 4 ++-- source/blender/blenkernel/intern/particle.c | 4 ++-- source/blender/blenkernel/intern/unit.c | 4 ++-- source/blender/blenlib/BLI_task.h | 2 +- source/blender/blenlib/intern/BLI_kdopbvh.c | 4 ++-- source/blender/blenloader/BLO_undofile.h | 2 +- source/blender/blenloader/intern/readfile.c | 4 ++-- source/blender/blenloader/intern/versioning_290.c | 2 +- source/blender/blenloader/intern/writefile.c | 2 +- source/blender/draw/engines/eevee/eevee_materials.c | 6 +++--- source/blender/draw/engines/eevee/eevee_private.h | 2 +- source/blender/draw/engines/eevee/eevee_renderpasses.c | 4 ++-- source/blender/draw/engines/eevee/eevee_shaders.c | 2 +- source/blender/draw/intern/draw_cache_extract_mesh.c | 2 +- source/blender/editors/interface/view2d_draw.c | 2 +- source/blender/editors/object/object_relations.c | 2 +- source/blender/editors/space_sequencer/sequencer_add.c | 2 +- source/blender/freestyle/intern/view_map/Silhouette.h | 8 ++++---- source/blender/gpu/intern/gpu_extensions.c | 4 ++-- source/blender/makesdna/DNA_userdef_types.h | 2 +- source/blender/makesrna/intern/rna_fluid.c | 2 +- 21 files changed, 33 insertions(+), 33 deletions(-) diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h index a7bf345567f..ad67ee290b0 100644 --- a/source/blender/blenkernel/BKE_modifier.h +++ b/source/blender/blenkernel/BKE_modifier.h @@ -214,10 +214,10 @@ typedef struct ModifierTypeInfo { /********************* Non-deform modifier functions *********************/ - /* For non-deform types: apply the modifier and return a mesh datablock. + /* For non-deform types: apply the modifier and return a mesh data-block. * * The mesh argument should always be non-NULL; the modifier should use the - * passed in mesh datablock rather than object->data, as it contains the mesh + * passed in mesh data-block rather than object->data, as it contains the mesh * with modifier applied up to this point. * * The modifier may modify and return the mesh argument, but must not free it diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 015c67806c6..eb485e1522f 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -4783,11 +4783,11 @@ void psys_get_dupli_texture(ParticleSystem *psys, /* XXX: on checking '(psmd->dm != NULL)' * This is incorrect but needed for metaball evaluation. - * Ideally this would be calculated via the depsgraph, however with metaballs, + * Ideally this would be calculated via the depsgraph, however with meta-balls, * the entire scenes dupli's are scanned, which also looks into uncalculated data. * * For now just include this workaround as an alternative to crashing, - * but longer term metaballs should behave in a more manageable way, see: T46622. */ + * but longer term meta-balls should behave in a more manageable way, see: T46622. */ uv[0] = uv[1] = 0.f; diff --git a/source/blender/blenkernel/intern/unit.c b/source/blender/blenkernel/intern/unit.c index a8136dd7932..f37feab4b85 100644 --- a/source/blender/blenkernel/intern/unit.c +++ b/source/blender/blenkernel/intern/unit.c @@ -716,7 +716,7 @@ static bool ch_is_op(char op) /** * Helper function for #unit_distribute_negatives to find the next negative to distribute. * - * \note This unecessarily skips the next space if it comes right after the "-" + * \note This unnecessarily skips the next space if it comes right after the "-" * just to make a more predictable output. */ static char *find_next_negative(const char *str, const char *remaining_str) @@ -742,7 +742,7 @@ static char *find_next_negative(const char *str, const char *remaining_str) /** * Helper function for #unit_distribute_negatives to find the next operation, including "-". * - * \note This unecessarily skips the space before the operation character + * \note This unnecessarily skips the space before the operation character * just to make a more predictable output. */ static char *find_next_op(const char *str, char *remaining_str, int len_max) diff --git a/source/blender/blenlib/BLI_task.h b/source/blender/blenlib/BLI_task.h index a4a855c354b..eee304a9b72 100644 --- a/source/blender/blenlib/BLI_task.h +++ b/source/blender/blenlib/BLI_task.h @@ -286,7 +286,7 @@ int BLI_task_parallel_thread_id(const TaskParallelTLS *tls); * ** Task-Data ** * * Typically you want give a task data to work on. - * Task data can be shared with other nodes, but be carefull not to free the data multiple times. + * Task data can be shared with other nodes, but be careful not to free the data multiple times. * Task data is freed when calling `BLI_task_graph_free`. * * MyData *task_data = MEM_callocN(sizeof(MyData), __func__); diff --git a/source/blender/blenlib/intern/BLI_kdopbvh.c b/source/blender/blenlib/intern/BLI_kdopbvh.c index 3a07cef7cac..da67baf0ead 100644 --- a/source/blender/blenlib/intern/BLI_kdopbvh.c +++ b/source/blender/blenlib/intern/BLI_kdopbvh.c @@ -719,10 +719,10 @@ static void non_recursive_bvh_div_nodes_task_cb(void *__restrict userdata, refit_kdop_hull(data->tree, parent, parent_leafs_begin, parent_leafs_end); split_axis = get_largest_axis(parent->bv); - /* Save split axis (this can be used on raytracing to speedup the query time) */ + /* Save split axis (this can be used on ray-tracing to speedup the query time) */ parent->main_axis = split_axis / 2; - /* Split the childs along the split_axis, note: its not needed to sort the whole leafs array + /* Split the children along the split_axis, note: its not needed to sort the whole leafs array * Only to assure that the elements are partitioned on a way that each child takes the elements * it would take in case the whole array was sorted. * Split_leafs takes care of that "sort" problem. */ diff --git a/source/blender/blenloader/BLO_undofile.h b/source/blender/blenloader/BLO_undofile.h index 175aa4ab9d0..f9300f8a521 100644 --- a/source/blender/blenloader/BLO_undofile.h +++ b/source/blender/blenloader/BLO_undofile.h @@ -39,7 +39,7 @@ typedef struct { * detect unchanged IDs). * Defined when writing the next step (i.e. last undo step has those always false). */ bool is_identical_future; - /** Session uuid of the ID being curently written (MAIN_ID_SESSION_UUID_UNSET when not writing + /** Session UUID of the ID being currently written (MAIN_ID_SESSION_UUID_UNSET when not writing * ID-related data). Used to find matching chunks in previous memundo step. */ uint id_session_uuid; } MemFileChunk; diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index db0187d0486..501e8de678d 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -2890,8 +2890,8 @@ static void direct_link_id_common( id->tag = tag; if (tag & LIB_TAG_ID_LINK_PLACEHOLDER) { - /* For placeholder we only need to set the tag and properly init generic ID fieds above, no - * further data to read. */ + /* For placeholder we only need to set the tag and properly initialize generic ID fields above, + * no further data to read. */ return; } diff --git a/source/blender/blenloader/intern/versioning_290.c b/source/blender/blenloader/intern/versioning_290.c index 1aa569d8336..ed23b69c623 100644 --- a/source/blender/blenloader/intern/versioning_290.c +++ b/source/blender/blenloader/intern/versioning_290.c @@ -244,7 +244,7 @@ void blo_do_versions_290(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!MAIN_VERSION_ATLEAST(bmain, 290, 4)) { - /* Clear old deprecated bitflag from edit weights modifiers, we now use it for something else. + /* Clear old deprecated bit-flag from edit weights modifiers, we now use it for something else. */ LISTBASE_FOREACH (Object *, ob, &bmain->objects) { LISTBASE_FOREACH (ModifierData *, md, &ob->modifiers) { diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index ca46579099f..70d4d1ba5ed 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -4183,7 +4183,7 @@ static bool write_file_handle(Main *mainvar, memcpy(id_buffer, id, idtype_struct_size); ((ID *)id_buffer)->tag = 0; - /* Those listbase data change everytime we add/remove an ID, and also often when renaming + /* Those listbase data change every time we add/remove an ID, and also often when renaming * one (due to re-sorting). This avoids generating a lot of false 'is changed' detections * between undo steps. */ ((ID *)id_buffer)->prev = NULL; diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c index 0f10fb0ef53..cfc70baaf01 100644 --- a/source/blender/draw/engines/eevee/eevee_materials.c +++ b/source/blender/draw/engines/eevee/eevee_materials.c @@ -563,9 +563,9 @@ static EeveeMaterialCache material_opaque(EEVEE_Data *vedata, const bool use_depth_shader = use_gpumat && ELEM(ma->blend_method, MA_BM_CLIP, MA_BM_HASHED); /* HACK: Assume the struct will never be smaller than our variations. - * This allow us to only keep one ghash and avoid bigger keys comparissons/hashing. */ + * This allow us to only keep one ghash and avoid bigger keys comparisons/hashing. */ void *key = (char *)ma + is_hair; - /* Search for other material instances (sharing the same Material datablock). */ + /* Search for other material instances (sharing the same Material data-block). */ EeveeMaterialCache **emc_p, *emc; if (BLI_ghash_ensure_p(pd->material_hash, key, (void ***)&emc_p)) { return **emc_p; @@ -641,7 +641,7 @@ static EeveeMaterialCache material_opaque(EEVEE_Data *vedata, /* Search for the same shaders usage in the pass. */ /* HACK: Assume the struct will never be smaller than our variations. - * This allow us to only keep one ghash and avoid bigger keys comparissons/hashing. */ + * This allow us to only keep one ghash and avoid bigger keys comparisons/hashing. */ BLI_assert(option <= 16); struct GPUShader *sh = GPU_material_get_shader(gpumat); void *cache_key = (char *)sh + option; diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h index dbe2adef789..40008c5c364 100644 --- a/source/blender/draw/engines/eevee/eevee_private.h +++ b/source/blender/draw/engines/eevee/eevee_private.h @@ -180,7 +180,7 @@ enum { /* Material shader cache keys */ enum { /* HACK: This assumes the struct GPUShader will never be smaller than our variations. - * This allow us to only keep one ghash and avoid bigger keys comparissons/hashing. + * This allow us to only keep one ghash and avoid bigger keys comparisons/hashing. * We combine the GPUShader pointer with the key. */ KEY_CULL = (1 << 0), KEY_REFRACT = (1 << 1), diff --git a/source/blender/draw/engines/eevee/eevee_renderpasses.c b/source/blender/draw/engines/eevee/eevee_renderpasses.c index 4a1880caf7d..9a47ca19e7b 100644 --- a/source/blender/draw/engines/eevee/eevee_renderpasses.c +++ b/source/blender/draw/engines/eevee/eevee_renderpasses.c @@ -215,7 +215,7 @@ void EEVEE_renderpasses_output_init(EEVEE_ViewLayerData *sldata, } } -/* Postprocess data to construct a specific renderpass +/* Post-process data to construct a specific render-pass * * This method will create a shading group to perform the post-processing for the given * `renderpass_type`. The post-processing will be done and the result will be stored in the @@ -223,7 +223,7 @@ void EEVEE_renderpasses_output_init(EEVEE_ViewLayerData *sldata, * * Only invoke this function for passes that need post-processing. * - * After invoking this function the active framebuffer is set to `vedata->fbl->renderpass_fb`. */ + * After invoking this function the active frame-buffer is set to `vedata->fbl->renderpass_fb`. */ void EEVEE_renderpasses_postprocess(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata, eViewLayerEEVEEPassType renderpass_type) diff --git a/source/blender/draw/engines/eevee/eevee_shaders.c b/source/blender/draw/engines/eevee/eevee_shaders.c index 4d25f62a317..09e74c84948 100644 --- a/source/blender/draw/engines/eevee/eevee_shaders.c +++ b/source/blender/draw/engines/eevee/eevee_shaders.c @@ -738,7 +738,7 @@ struct GPUMaterial *EEVEE_material_get( } /* Meh, implicit option. World probe cannot be deferred because they need - * to be rendered immediatly. */ + * to be rendered immediately. */ const bool deferred = (options & VAR_WORLD_PROBE) == 0; GPUMaterial *mat = eevee_material_get_ex(scene, ma, wo, options, deferred); diff --git a/source/blender/draw/intern/draw_cache_extract_mesh.c b/source/blender/draw/intern/draw_cache_extract_mesh.c index 0fd6bf54856..06462d5b9c5 100644 --- a/source/blender/draw/intern/draw_cache_extract_mesh.c +++ b/source/blender/draw/intern/draw_cache_extract_mesh.c @@ -5086,7 +5086,7 @@ void mesh_buffer_cache_create_requested(struct TaskGraph *task_graph, EXTRACT(ibo, edituv_points); EXTRACT(ibo, edituv_fdots); - /* Only create the edge when there are user datas that needs to be inited. + /* Only create the edge when there is user data that needs to be initialized. * The task is still part of the graph so the task_data will be freed when the graph is freed. */ if (!BLI_listbase_is_empty(&user_data_init_task_data->task_datas)) { diff --git a/source/blender/editors/interface/view2d_draw.c b/source/blender/editors/interface/view2d_draw.c index 36213f919a3..677043c1ccf 100644 --- a/source/blender/editors/interface/view2d_draw.c +++ b/source/blender/editors/interface/view2d_draw.c @@ -203,7 +203,7 @@ static void draw_parallel_lines(const ParallelLinesSet *lines, immBindBuiltinProgram(GPU_SHADER_3D_POLYLINE_UNIFORM_COLOR); immUniform2fv("viewportSize", &viewport[2]); - /* -1.0f offset here is because the line is too fat due to the builtin antialiasing. + /* -1.0f offset here is because the line is too fat due to the builtin anti-aliasing. * TODO make a variant or a uniform to toggle it off. */ immUniform1f("lineWidth", U.pixelsize - 1.0f); } diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index ca3a559ca1d..0e8545e07ba 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -2540,7 +2540,7 @@ static int make_override_library_exec(bContext *C, wmOperator *op) } FOREACH_COLLECTION_OBJECT_RECURSIVE_END; - /* Remove the instance empty from this scene, the items now have an overriden collection + /* Remove the instance empty from this scene, the items now have an overridden collection * instead. */ ED_object_base_free_and_unlink(bmain, scene, obcollection); diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index 80172c5462f..6202a3556a4 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -655,7 +655,7 @@ static int sequencer_add_movie_strip_invoke(bContext *C, Scene *scene = CTX_data_scene(C); Editing *ed = BKE_sequencer_editing_get(scene, false); - /* Only enable "use_framerate" if there aren't any existing strips, unless overriden by user. */ + /* Only enable "use_framerate" if there aren't any existing strips, unless overridden by user. */ if (ed && ed->seqbasep && ed->seqbasep->first) { RNA_boolean_set(op->ptr, "use_framerate", false); } diff --git a/source/blender/freestyle/intern/view_map/Silhouette.h b/source/blender/freestyle/intern/view_map/Silhouette.h index 648eb4e453d..8503836e0ca 100644 --- a/source/blender/freestyle/intern/view_map/Silhouette.h +++ b/source/blender/freestyle/intern/view_map/Silhouette.h @@ -1592,15 +1592,15 @@ class SShape { /*! Splits an edge into several edges. * The edge's vertices are passed rather than the edge itself. This way, all feature edges - * (SILHOUETTE, CREASE, BORDER) are splitted in the same time. The processed edges are flagged as - * done (using the userdata flag).One single new vertex is created whereas several splitted edges + * (SILHOUETTE, CREASE, BORDER) are split in the same time. The processed edges are flagged as + * done (using the user-data flag).One single new vertex is created whereas several split edges * might created for the different kinds of edges. These new elements are added to the lists * maintained by the shape. * New chains are also created. * ioA - * The first vertex for the edge that gets splitted + * The first vertex for the edge that gets split. * ioB - * The second vertex for the edge that gets splitted + * The second vertex for the edge that gets split. * iParameters * A vector containing 2D real vectors indicating the parameters giving the intersections * coordinates in 3D and in 2D. These intersections points must be sorted from B to A. Each diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c index 8f911f3c77d..8dd468b5414 100644 --- a/source/blender/gpu/intern/gpu_extensions.c +++ b/source/blender/gpu/intern/gpu_extensions.c @@ -304,8 +304,8 @@ void gpu_extensions_init(void) GG.context_local_shaders_workaround = GLEW_ARB_get_program_binary; } - /* Special fix for theses specific GPUs. Without thoses workaround, blender crashes on strartup. - * (see T72098) */ + /* Special fix for theses specific GPUs. + * Without this workaround, blender crashes on startup. (see T72098) */ if (GPU_type_matches(GPU_DEVICE_INTEL, GPU_OS_WIN, GPU_DRIVER_OFFICIAL) && (strstr(renderer, "HD Graphics 620") || strstr(renderer, "HD Graphics 630"))) { GG.mip_render_workaround = true; diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 019e4c9ea9e..63e7a90547e 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -1189,7 +1189,7 @@ typedef enum eColorPicker_Types { } eColorPicker_Types; /** - * Timecode display styles + * Time-code display styles. * #UserDef.timecode_style */ typedef enum eTimecodeStyles { diff --git a/source/blender/makesrna/intern/rna_fluid.c b/source/blender/makesrna/intern/rna_fluid.c index 43d2234ddf2..94ba09b2bb8 100644 --- a/source/blender/makesrna/intern/rna_fluid.c +++ b/source/blender/makesrna/intern/rna_fluid.c @@ -228,7 +228,7 @@ static void rna_Fluid_flip_parts_update(Main *bmain, Scene *scene, PointerRNA *p bool exists = rna_Fluid_parts_exists(ptr, PART_FLUID_FLIP); /* Only create a particle system in liquid domain mode. - * Remove any remainings of a liquid sim when switching to gas. */ + * Remove any remaining data from a liquid sim when switching to gas. */ if (mmd->domain->type != FLUID_DOMAIN_TYPE_LIQUID) { rna_Fluid_parts_delete(ptr, PART_FLUID_FLIP); mmd->domain->particle_type &= ~FLUID_DOMAIN_PARTICLE_FLIP; -- cgit v1.2.3