Commit: d1eefc421544e2ea632fb35cb6bcaade4c39ce6b Author: Harley Acheson Date: Mon Oct 19 08:43:08 2020 -0700 Branches: master https://developer.blender.org/rBd1eefc421544e2ea632fb35cb6bcaade4c39ce6b
Spelling: Then Versus Than Corrects incorrect usages of the words 'then' and 'than'. Differential Revision: https://developer.blender.org/D9246 Reviewed by Campbell Barton =================================================================== M intern/dualcon/intern/octree.cpp M intern/ghost/intern/GHOST_System.cpp M source/blender/blenkernel/intern/armature.c M source/blender/blenkernel/intern/customdata.c M source/blender/blenkernel/intern/image_gen.c M source/blender/blenkernel/intern/lattice.c M source/blender/blenkernel/intern/mball.c M source/blender/blenkernel/intern/mesh.c M source/blender/blenkernel/intern/mesh_evaluate.c M source/blender/blenkernel/intern/modifier.c M source/blender/blenkernel/intern/paint.c M source/blender/blenkernel/intern/pointcache.c M source/blender/blenlib/BLI_scanfill.h M source/blender/blenlib/intern/array_store.c M source/blender/blenlib/intern/polyfill_2d.c M source/blender/blenlib/intern/smallhash.c M source/blender/blenlib/intern/storage.c M source/blender/blenlib/intern/winstuff_dir.c M source/blender/blenloader/intern/readfile.c M source/blender/blenloader/intern/versioning_legacy.c M source/blender/bmesh/intern/bmesh_delete.c M source/blender/bmesh/intern/bmesh_error.h M source/blender/bmesh/intern/bmesh_inline.h M source/blender/bmesh/intern/bmesh_mesh.c M source/blender/bmesh/intern/bmesh_mesh_convert.c M source/blender/bmesh/intern/bmesh_mods.c M source/blender/bmesh/intern/bmesh_opdefines.c M source/blender/bmesh/intern/bmesh_polygon_edgenet.c M source/blender/bmesh/intern/bmesh_query.c M source/blender/bmesh/intern/bmesh_walkers.c M source/blender/bmesh/intern/bmesh_walkers_impl.c M source/blender/bmesh/operators/bmo_connect_pair.c M source/blender/bmesh/operators/bmo_create.c M source/blender/bmesh/operators/bmo_fill_grid.c M source/blender/bmesh/tools/bmesh_decimate_collapse.c M source/blender/draw/intern/draw_cache_extract_mesh.c M source/blender/draw/intern/shaders/common_fxaa_lib.glsl M source/blender/editors/interface/interface.c M source/blender/editors/interface/interface_intern.h M source/blender/editors/interface/interface_region_color_picker.c M source/blender/editors/mask/mask_add.c M source/blender/editors/mesh/editmesh_inset.c M source/blender/editors/mesh/editmesh_knife.c M source/blender/editors/mesh/editmesh_rip.c M source/blender/editors/mesh/editmesh_tools.c M source/blender/editors/physics/particle_edit.c M source/blender/editors/sculpt_paint/paint_image_proj.c M source/blender/editors/sculpt_paint/paint_stroke.c M source/blender/editors/space_file/filesel.c M source/blender/editors/space_image/image_ops.c M source/blender/editors/space_info/textview.c M source/blender/editors/space_node/node_view.c M source/blender/editors/space_sequencer/sequencer_scopes.c M source/blender/editors/space_view3d/view3d_gizmo_ruler.c M source/blender/editors/space_view3d/view3d_view.c M source/blender/editors/transform/transform_convert_mesh.c M source/blender/editors/transform/transform_input.c M source/blender/imbuf/IMB_thumbs.h M source/blender/imbuf/intern/jp2.c M source/blender/makesdna/DNA_key_types.h M source/blender/makesrna/intern/makesrna.c M source/blender/makesrna/intern/rna_access.c M source/blender/makesrna/intern/rna_armature.c M source/blender/makesrna/intern/rna_modifier.c M source/blender/makesrna/intern/rna_pose.c M source/blender/modifiers/intern/MOD_screw.c M source/blender/python/intern/bpy_rna.c =================================================================== diff --git a/intern/dualcon/intern/octree.cpp b/intern/dualcon/intern/octree.cpp index c9d5639cb5d..94ab3085b5c 100644 --- a/intern/dualcon/intern/octree.cpp +++ b/intern/dualcon/intern/octree.cpp @@ -1996,7 +1996,7 @@ int Octree::floodFill(LeafNode *leaf, int st[3], int len, int /*height*/, int th delete queue; continue; } - dc_printf("Less then %d, removing...\n", threshold); + dc_printf("Less than %d, removing...\n", threshold); // We have to remove this noise diff --git a/intern/ghost/intern/GHOST_System.cpp b/intern/ghost/intern/GHOST_System.cpp index b0d2adff4bc..46c50045b80 100644 --- a/intern/ghost/intern/GHOST_System.cpp +++ b/intern/ghost/intern/GHOST_System.cpp @@ -360,7 +360,7 @@ GHOST_TSuccess GHOST_System::createFullScreenWindow(GHOST_Window **window, glSettings.flags |= GHOST_glAlphaBackground; /* note: don't use getCurrentDisplaySetting() because on X11 we may - * be zoomed in and the desktop may be bigger then the viewport. */ + * be zoomed in and the desktop may be bigger than the viewport. */ GHOST_ASSERT(m_displayManager, "GHOST_System::createFullScreenWindow(): invalid display manager"); // GHOST_PRINT("GHOST_System::createFullScreenWindow(): creating full-screen window\n"); diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index 8c4cad8b3ba..e0b12228162 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -1884,7 +1884,7 @@ void BKE_armature_mat_pose_to_bone_ex(struct Depsgraph *depsgraph, BKE_pose_where_is_bone(depsgraph, NULL, ob, &work_pchan, 0.0f, false); /* find the matrix, need to remove the bone transforms first so this is - * calculated as a matrix to set rather then a difference ontop of what's + * calculated as a matrix to set rather than a difference ontop of what's * already there. */ unit_m4(outmat); BKE_pchan_apply_mat4(&work_pchan, outmat, false); diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index 2b2b1fb70ce..466a0115a9d 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -3603,7 +3603,7 @@ void CustomData_bmesh_free_block(CustomData *data, void **block) } /** - * Same as #CustomData_bmesh_free_block but zero the memory rather then freeing. + * Same as #CustomData_bmesh_free_block but zero the memory rather than freeing. */ void CustomData_bmesh_free_block_data(CustomData *data, void *block) { diff --git a/source/blender/blenkernel/intern/image_gen.c b/source/blender/blenkernel/intern/image_gen.c index bb2c086f02c..877747a257e 100644 --- a/source/blender/blenkernel/intern/image_gen.c +++ b/source/blender/blenkernel/intern/image_gen.c @@ -240,7 +240,7 @@ static void checker_board_color_fill( } for (y = offset; y < height + offset; y++) { - /* Use a number lower then 1.0 else its too bright. */ + /* Use a number lower than 1.0 else its too bright. */ hsv[2] = 0.1 + (y * (0.4 / total_height)); for (x = 0; x < width; x++) { diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c index fc0e337ec30..c0eb6b4b134 100644 --- a/source/blender/blenkernel/intern/lattice.c +++ b/source/blender/blenkernel/intern/lattice.c @@ -311,7 +311,7 @@ void BKE_lattice_resize(Lattice *lt, int uNew, int vNew, int wNew, Object *ltOb) calc_lat_fudu(lt->flag, vNew, &fv, &dv); calc_lat_fudu(lt->flag, wNew, &fw, &dw); - /* If old size is different then resolution changed in interface, + /* If old size is different than resolution changed in interface, * try to do clever reinit of points. Pretty simply idea, we just * deform new verts by old lattice, but scaling them to match old * size first. diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c index e60a5f7b616..d2bacb7d3bc 100644 --- a/source/blender/blenkernel/intern/mball.c +++ b/source/blender/blenkernel/intern/mball.c @@ -378,7 +378,7 @@ float *BKE_mball_make_orco(Object *ob, ListBase *dispbase) * * This is a can of worms. * - * This really needs a rewrite/refactor its totally broken in anything other then basic cases + * This really needs a rewrite/refactor its totally broken in anything other than basic cases * Multiple Scenes + Set Scenes & mixing meta-ball basis _should_ work but fails to update the * depsgraph on rename and linking into scenes or removal of basis meta-ball. * So take care when changing this code. diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 9765cd7fa1e..6ea83cf4330 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -671,7 +671,7 @@ static void mesh_ensure_tessellation_customdata(Mesh *me) /* TODO - add some --debug-mesh option */ if (G.debug & G_DEBUG) { /* note: this warning may be un-called for if we are initializing the mesh for the - * first time from bmesh, rather then giving a warning about this we could be smarter + * first time from bmesh, rather than giving a warning about this we could be smarter * and check if there was any data to begin with, for now just print the warning with * some info to help troubleshoot what's going on - campbell */ printf( diff --git a/source/blender/blenkernel/intern/mesh_evaluate.c b/source/blender/blenkernel/intern/mesh_evaluate.c index 0c83820bce9..0aa8f7ca260 100644 --- a/source/blender/blenkernel/intern/mesh_evaluate.c +++ b/source/blender/blenkernel/intern/mesh_evaluate.c @@ -2207,7 +2207,7 @@ void BKE_mesh_calc_poly_normal(const MPoly *mpoly, r_no[2] = 1.0; } } -/* duplicate of function above _but_ takes coords rather then mverts */ +/* duplicate of function above _but_ takes coords rather than mverts */ static void mesh_calc_ngon_normal_coords(const MPoly *mpoly, const MLoop *loopstart, const float (*vertex_coords)[3], diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index 6ace8f87994..0aa85f0ad50 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -926,7 +926,7 @@ const char *BKE_modifier_path_relbase(Main *bmain, Object *ob) return ID_BLEND_PATH(bmain, &ob->id); } - /* last resort, better then using "" which resolves to the current + /* last resort, better than using "" which resolves to the current * working directory */ return BKE_tempdir_session(); } @@ -937,7 +937,7 @@ const char *BKE_modifier_path_relbase_from_global(Object *ob) return ID_BLEND_PATH_FROM_GLOBAL(&ob->id); } - /* last resort, better then using "" which resolves to the current + /* last resort, better than using "" which resolves to the current * working directory */ return BKE_tempdir_session(); } diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index 88415140a5b..42749a93988 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -1130,7 +1130,7 @@ void BKE_paint_free(Paint *paint) } /* called when copying scene settings, so even if 'src' and 'tar' are the same - * still do a id_us_plus(), rather then if we were copying between 2 existing + * still do a id_us_plus(), rather than if we were copying between 2 existing * scenes where a matching value should decrease the existing user count as * with paint_brush_set() */ void BKE_paint_copy(Paint *src, Paint *tar, const int flag) diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index 9d9e0a9c9cb..7c8527a8702 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -1348,7 +1348,7 @@ static int ptcache_path(PTCacheID *pid, char *filename) return BLI_path_slash_ensure(filename); /* new strlen() */ } - /* use the temp path. this is weak but better then not using point cache at all */ + /* use the temp path. this is weak but better than not using point cache at all */ /* temporary directory is assumed to exist and ALWAYS has a trailing slash */ BLI_snprintf(filename, MAX_PTCACHE_PATH, "%s" PTCACHE_PATH, BKE_tempdir_session()); diff --git a/source/blender/blenlib/BLI_scanfill.h b/source/blender/blenlib/BLI_scanfill.h index cf74bc14cac..fa57f0486e5 100644 --- a/source/blender/blenlib/BLI_scanfill.h +++ b/source/blender/blenlib/BLI_scanfill.h @@ -106,7 +106,7 @@ enum { BLI_SCANFILL_CALC_POLYS = (1 << 2), /* note: This flag removes checks for overlapping polygons. - * when this flag is set, we'll never get back more faces then (totvert - 2) */ + * when this flag is set, we'll never get back more faces than (totvert - 2) */ BLI_SCANFILL_CALC_HOLES = (1 << 3), /* checks valid edge users - can skip for simple loops */ diff --git a/source/blender/blenlib/intern/array_store.c b/source/blender/blenlib/intern/array_store.c index 387f9837159..a6a0c21b104 100644 --- a/source/blender/blenlib/intern/array_store.c +++ b/source/blender/blenlib/intern/array_store.c @@ -189,7 +189,7 @@ */ # define BCHUNK_SIZE_MIN_DIV 8 -/* Disallow chunks bigger then the regular chunk size scaled by this value +/* Disallow chunks bigger than the regular chunk size scaled by this value * note: must be at least 2! * however, this code runs wont run in tests unless its ~1.1 ugh. * so lower only to check splitting works. @@ -523,7 +523,7 @@ static void bchunk_list_calc_trim_len(const BArrayInfo *info, #ifdef USE_MERGE_CHUNKS /* avoid creating too-small chunks - * more efficient then merging after */ + * more efficient than merging after */ if (data_len > info->chunk_byte_size) { data_last_chunk_len = (data_trim_len % info->chunk_byte_size); data_trim_len = data_trim_len - data_last_chunk_len; diff --git a/source/blender/blenlib/intern/polyfill_2d.c b/s @@ 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