diff options
67 files changed, 90 insertions, 90 deletions
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/source/blender/blenlib/intern/polyfill_2d.c index eb7e5ca6658..fe9fa514e08 100644 --- a/source/blender/blenlib/intern/polyfill_2d.c +++ b/source/blender/blenlib/intern/polyfill_2d.c @@ -85,7 +85,7 @@ typedef signed char eSign; * This is a single purpose KDTree based on BLI_kdtree with some modifications * to better suit polyfill2d. * - #KDTreeNode2D is kept small (only 16 bytes), - * by not storing coords in the nodes and using index values rather then pointers + * by not storing coords in the nodes and using index values rather than pointers * to reference neg/pos values. * * - #kdtree2d_isect_tri is the only function currently used. @@ -719,7 +719,7 @@ static bool pf_ear_tip_check(PolyFill *pf, PolyIndex *pi_ear_tip) * the area sign will be positive if the point is strictly inside. * It will be 0 on the edge, which we want to include as well. */ - /* note: check (v3, v1) first since it fails _far_ more often then the other 2 checks + /* note: check (v3, v1) first since it fails _far_ more often than the other 2 checks * (those fail equally). * It's logical - the chance is low that points exist on the * same side as the ear we're clipping off. */ diff --git a/source/blender/blenlib/intern/smallhash.c b/source/blender/blenlib/intern/smallhash.c index 4a2915ef24e..a091b41af23 100644 --- a/source/blender/blenlib/intern/smallhash.c +++ b/source/blender/blenlib/intern/smallhash.c @@ -24,7 +24,7 @@ * fixed size hash tables but falls back to heap memory once the stack limits reached * (#SMSTACKSIZE). * - * based on a doubling hashing approach (non-chaining) which uses more buckets then entries + * based on a doubling hashing approach (non-chaining) which uses more buckets than entries * stepping over buckets when two keys share the same hash so any key can find a free bucket. * * See: https://en.wikipedia.org/wiki/Double_hashing diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c index 628bdc1a31f..d1e133318ba 100644 --- a/source/blender/blenlib/intern/storage.c +++ b/source/blender/blenlib/intern/storage.c @@ -636,7 +636,7 @@ void BLI_file_free_lines(LinkNode *lines) BLI_linklist_freeN(lines); } -/** is file1 older then file2 */ +/** is file1 older than file2 */ bool BLI_file_older(const char *file1, const char *file2) { #ifdef WIN32 diff --git a/source/blender/blenlib/intern/winstuff_dir.c b/source/blender/blenlib/intern/winstuff_dir.c index 4db385bd8aa..2dc41bfc54c 100644 --- a/source/blender/blenlib/intern/winstuff_dir.c +++ b/source/blender/blenlib/intern/winstuff_dir.c @@ -24,7 +24,7 @@ #ifdef WIN32 -/* standalone for inclusion in binaries other then blender */ +/* standalone for inclusion in binaries other than blender */ # ifdef USE_STANDALONE # define MEM_mallocN(size, str) ((void)str, malloc(size)) # define MEM_callocN(size, str) ((void)str, calloc(size, 1)) diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 4955fbb8300..c5d805e6448 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -294,7 +294,7 @@ typedef struct BHeadN { * This function ensures that reports are printed, * in the case of library linking errors this is important! * - * bit kludge but better then doubling up on prints, + * bit kludge but better than doubling up on prints, * we could alternatively have a versions of a report function which forces printing - campbell */ void blo_reportf_wrap(ReportList *reports, ReportType type, const char *format, ...) @@ -1233,7 +1233,7 @@ static ssize_t fd_read_from_memory(FileData *filedata, size_t size, bool *UNUSED(r_is_memchunck_identical)) { - /* don't read more bytes then there are available in the buffer */ + /* don't read more bytes than there are available in the buffer */ ssize_t readsize = (ssize_t)MIN2(size, filedata->buffersize - (size_t)filedata->file_offset); memcpy(buffer, filedata->buffer + filedata->file_offset, (size_t)readsize); @@ -3289,7 +3289,7 @@ static void lib_link_object(BlendLibReader *reader, Object *ob) /* we can't call #BKE_pose_free() here because of library linking * freeing will recurse down into every pose constraints ID pointers * which are not always valid, so for now free directly and suffer - * some leaked memory rather then crashing immediately + * some leaked memory rather than crashing immediately * while bad this _is_ an exceptional case - campbell */ #if 0 BKE_pose_free(ob->pose); diff --git a/source/blender/blenloader/intern/versioning_legacy.c b/source/blender/blenloader/intern/versioning_legacy.c index 666806479b2..4acf98cc58b 100644 --- a/source/blender/blenloader/intern/versioning_legacy.c +++ b/source/blender/blenloader/intern/versioning_legacy.c @@ -2178,7 +2178,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) } if (!MAIN_VERSION_ATLEAST(bmain, 245, 5)) { - /* foreground color needs to be something other then black */ + /* foreground color needs to be something other than black */ Scene *sce; for (sce = bmain->scenes.first; sce; sce = sce->id.next) { sce->r.fg_stamp[0] = sce->r.fg_stamp[1] = sce->r.fg_stamp[2] = 0.8f; diff --git a/source/blender/bmesh/intern/bmesh_delete.c b/source/blender/bmesh/intern/bmesh_delete.c index 4e2c81c80c3..b5ff24f6d61 100644 --- a/source/blender/bmesh/intern/bmesh_delete.c +++ b/source/blender/bmesh/intern/bmesh_delete.c @@ -207,7 +207,7 @@ void BMO_mesh_delete_oflag_context(BMesh *bm, const short oflag, const int type) /* BM functions * * note! this is just a duplicate of the code above (bad!) - * but for now keep in sync, its less hassle then having to create bmesh operator flags, + * but for now keep in sync, its less hassle than having to create bmesh operator flags, * each time we need to remove some geometry. */ diff --git a/source/blender/bmesh/intern/bmesh_error.h b/source/blender/bmesh/intern/bmesh_error.h index 2307377fd71..1837ad8dd71 100644 --- a/source/blender/bmesh/intern/bmesh_error.h +++ b/source/blender/bmesh/intern/bmesh_error.h @@ -71,7 +71,7 @@ enum { # define _BMESH_DUMMY_ABORT() (void)0 #endif -/* this is meant to be higher level then BLI_assert(), +/* this is meant to be higher level than BLI_assert(), * its enabled even when in Release mode*/ #define BMESH_ASSERT(a) \ (void)((!(a)) ? ((fprintf(stderr, \ diff --git a/source/blender/bmesh/intern/bmesh_inline.h b/source/blender/bmesh/intern/bmesh_inline.h index 203f44a540d..2888d7e7526 100644 --- a/source/blender/bmesh/intern/bmesh_inline.h +++ b/source/blender/bmesh/intern/bmesh_inline.h @@ -100,7 +100,7 @@ BLI_INLINE void _bm_elem_flag_merge_into(BMHeader *head, * the mesh structure. * * To set the elements to valid indices 'BM_mesh_elem_index_ensure' should be used - * rather then adding inline loops, however there are cases where we still + * rather than adding inline loops, however there are cases where we still * set the index directly * * In an attempt to manage this, diff --git a/source/blender/bmesh/intern/bmesh_mesh.c b/source/blender/bmesh/intern/bmesh_mesh.c index 8eed3141c7f..1393edfe8a2 100644 --- a/source/blender/bmesh/intern/bmesh_mesh.c +++ b/source/blender/bmesh/intern/bmesh_mesh.c @@ -2956,7 +2956,7 @@ void BM_mesh_rebuild(BMesh *bm, #undef REMAP_EDGE /* Cleanup, re-use local tables if the current mesh had tables allocated. - * could use irrespective but it may use more memory then the caller wants + * could use irrespective but it may use more memory than the caller wants * (and not be needed). */ if (remap & BM_VERT) { if (bm->vtable) { diff --git a/source/blender/bmesh/intern/bmesh_mesh_convert.c b/source/blender/bmesh/intern/bmesh_mesh_convert.c index 90b0cca4b9c..c30f71e029f 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_convert.c +++ b/source/blender/bmesh/intern/bmesh_mesh_convert.c @@ -22,7 +22,7 @@ * \section bm_mesh_conv_shapekey Converting Shape Keys * * When converting to/from a Mesh/BMesh you can optionally pass a shape key to edit. - * This has the effect of editing the shape key-block rather then the original mesh vertex coords + * This has the effect of editing the shape key-block rather than the original mesh vertex coords * (although additional geometry is still allowed and uses fallback locations on converting). * * While this works for any mesh/bmesh this is made use of by entering and exiting edit-mode. @@ -1096,7 +1096,7 @@ void BM_mesh_bm_to_me_for_eval(BMesh *bm, Mesh *me, const CustomData_MeshMasks * med->flag = BM_edge_flag_to_mflag(eed); /* Handle this differently to editmode switching, - * only enable draw for single user edges rather then calculating angle. */ + * only enable draw for single user edges rather than calculating angle. */ if ((med->flag & ME_EDGEDRAW) == 0) { if (eed->l && eed->l == eed->l->radial_next) { med->flag |= ME_EDGEDRAW; diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c index d76a6eb0824..4c72b802396 100644 --- a/source/blender/bmesh/intern/bmesh_mods.c +++ b/source/blender/bmesh/intern/bmesh_mods.c @@ -53,7 +53,7 @@ * Before: +----v----+ After: +---------+ * </pre> * - * \note dissolves vert, in more situations then BM_disk_dissolve + * \note dissolves vert, in more situations than BM_disk_dissolve * (e.g. if the vert is part of a wire edge, etc). */ bool BM_vert_dissolve(BMesh *bm, BMVert *v) @@ -1052,7 +1052,7 @@ BMEdge *BM_edge_rotate(BMesh *bm, BMEdge *e, const bool ccw, const short check_f if ((l1 = BM_face_vert_share_loop(f, v1)) && (l2 = BM_face_vert_share_loop(f, v2)) && BM_face_split(bm, f, l1, l2, NULL, NULL, true)) { /* we should really be able to know the faces some other way, - * rather then fetching them back from the edge, but this is predictable + * rather than fetching them back from the edge, but this is predictable * where using the return values from face split isn't. - campbell */ BMFace *fa, *fb; if (BM_edge_face_pair(e_new, &fa, &fb)) { diff --git a/source/blender/bmesh/intern/bmesh_opdefines.c b/source/blender/bmesh/intern/bmesh_opdefines.c index 4117ad67dd3..ea64c9415b9 100644 --- a/source/blender/bmesh/intern/bmesh_opdefines.c +++ b/source/blender/bmesh/intern/bmesh_opdefines.c @@ -57,7 +57,7 @@ /* The formatting of these bmesh operators is parsed by * 'doc/python_api/rst_from_bmesh_opdefines.py' * for use in python docs, so reStructuredText may be used - * rather then doxygen syntax. + * rather than doxygen syntax. * * template (py quotes used because nested comments don't work * on all C compilers): @@ -366,7 +366,7 @@ static BMOpDefine bmo_find_doubles_def = { /* * Remove Doubles. * - * Finds groups of vertices closer then dist and merges them together, + * Finds groups of vertices closer than dist and merges them together, * using the weld verts bmop. */ static BMOpDefine bmo_remove_doubles_def = { diff --git a/source/blender/bmesh/intern/bmesh_polygon_edgenet.c b/source/blender/bmesh/intern/bmesh_polygon_edgenet.c index 54dc25ebeba..ad153f01cd4 100644 --- a/source/blender/bmesh/intern/bmesh_polygon_edgenet.c +++ b/source/blender/bmesh/intern/bmesh_polygon_edgenet.c @@ -1667,7 +1667,7 @@ finally: } while ((tvp = tvp->next)); /* Remove edges which have become doubles since splicing vertices together, - * its less trouble then detecting future-doubles on edge-creation. */ + * its less trouble than detecting future-doubles on edge-creation. */ for (uint i = edge_net_init_len; i < edge_net_new_len; i++) { while (BM_edge_find_double(edge_net_new[i])) { BM_edge_kill(bm, edge_net_new[i]); diff --git a/source/blender/bmesh/intern/bmesh_query.c b/source/blender/bmesh/intern/bmesh_query.c index e102c1fe41c..791fa64ae7d 100644 --- a/source/blender/bmesh/intern/bmesh_query.c +++ b/source/blender/bmesh/intern/bmesh_query.c @@ -360,7 +360,7 @@ float BM_loop_point_side_of_edge_test(const BMLoop *l, const float co[3]) * Given 2 verts, * find a face they share that has the lowest angle across these verts and give back both loops. * - * This can be better then #BM_vert_pair_share_face_by_len + * This can be better than #BM_vert_pair_share_face_by_len * because concave splits are ranked lowest. */ BMFace *BM_vert_pair_share_face_by_angle( @@ -1380,7 +1380,7 @@ BMVert *BM_edge_share_vert(BMEdge *e1, BMEdge *e2) * * Finds the loop used which uses \a in face loop \a l * - * \note this function takes a loop rather then an edge + * \note this function takes a loop rather than an edge * so we can select the face that the loop should be from. */ BMLoop *BM_edge_vert_share_loop(BMLoop *l, BMVert *v) @@ -2176,7 +2176,7 @@ bool BM_face_exists_multi(BMVert **varr, BMEdge **earr, int len) int i; for (i = 0; i < len; i++) { - /* save some time by looping over edge faces rather then vert faces + /* save some time by looping over edge faces rather than vert faces * will still loop over some faces twice but not as many */ BM_ITER_ELEM (f, &fiter, earr[i], BM_FACES_OF_EDGE) { BM_elem_flag_disable(f, BM_ELEM_INTERNAL_TAG); diff --git a/source/blender/bmesh/intern/bmesh_walkers.c b/source/blender/bmesh/intern/bmesh_walkers.c index da1d3df2046..8bdf205babd 100644 --- a/source/blender/bmesh/intern/bmesh_walkers.c +++ b/source/blender/bmesh/intern/bmesh_walkers.c @@ -46,7 +46,7 @@ * * - Walkers use tool flags, not header flags. * - Walkers now use ghash for storing visited elements, - * rather then stealing flags. ghash can be rewritten + * rather than stealing flags. ghash can be rewritten * to be faster if necessary, in the far future :) . * - tools should ALWAYS have necessary error handling * for if walkers fail. diff --git a/source/blender/bmesh/intern/bmesh_walkers_impl.c b/source/blender/bmesh/intern/bmesh_walkers_impl.c index 88ddac425ee..99be57b7b53 100644 --- a/source/blender/bmesh/intern/bmesh_walkers_impl.c +++ b/source/blender/bmesh/intern/bmesh_walkers_impl.c @@ -636,7 +636,7 @@ static void *bmw_ConnectedVertexWalker_step(BMWalker *walker) * * \note that this doesn't work on non-manifold geometry. * it might be better to rewrite this to extract - * boundary info from the island walker, rather then directly walking + * boundary info from the island walker, rather than directly walking * over the boundary. raises an error if it encounters non-manifold geometry. * * \todo Add restriction flag/callback for wire edges. diff --git a/source/blender/bmesh/operators/bmo_connect_pair.c b/source/blender/bmesh/operators/bmo_connect_pair.c index 087cd2cd01f..1c861df0150 100644 --- a/source/blender/bmesh/operators/bmo_connect_pair.c +++ b/source/blender/bmesh/operators/bmo_connect_pair.c @@ -44,7 +44,7 @@ * this avoids going into an eternal loop if there are many possible branches (see T45582). * - when running into a branch, create a new #PathLinkState state and add to the heap. * - when the target is reached, - * finish - since none of the other paths can be shorter then the one just found. + * finish - since none of the other paths can be shorter than the one just found. * - if the connection can't be found - fail. * - with the connection found, split all edges tagging verts * (or tag verts that sit on the intersection). diff --git a/source/blender/bmesh/operators/bmo_create.c b/source/blender/bmesh/operators/bmo_create.c index 0789000969e..f38e2e08f33 100644 --- a/source/blender/bmesh/operators/bmo_create.c +++ b/source/blender/bmesh/operators/bmo_create.c @@ -228,7 +228,7 @@ void bmo_contextual_create_exec(BMesh *bm, BMOperator *op) /* tricky feature for making a line/edge from selection history... * - * Rather then do nothing, when 5+ verts are selected, check if they are in our history, + * Rather than do nothing, when 5+ verts are selected, check if they are in our history, * when this is so, we can make edges from them, but _not_ a face, * if it is the intention to make a face the user can just hit F again * since there will be edges next time around. diff --git a/source/blender/bmesh/operators/bmo_fill_grid.c b/source/blender/bmesh/operators/bmo_fill_grid.c index 6986655c6de..c97e855aa67 100644 --- a/source/blender/bmesh/operators/bmo_fill_grid.c +++ b/source/blender/bmesh/operators/bmo_fill_grid.c @@ -126,7 +126,7 @@ static void bm_loop_pair_from_verts(BMVert *v_a, BMVert *v_b, BMLoop *l_pair[2]) /** * Copy loop pair from one side to the other if either is missing, * this simplifies interpolation code so we only need to check if x/y are missing, - * rather then checking each loop. + * rather than checking each loop. */ static void bm_loop_pair_test_copy(BMLoop *l_pair_a[2], BMLoop *l_pair_b[2]) { diff --git a/source/blender/bmesh/tools/bmesh_decimate_collapse.c b/source/blender/bmesh/tools/bmesh_decimate_collapse.c index 3ef5b42b2cd..60c49587387 100644 --- a/source/blender/bmesh/tools/bmesh_decimate_collapse.c +++ b/source/blender/bmesh/tools/bmesh_decimate_collapse.c @@ -202,7 +202,7 @@ static bool bm_edge_collapse_is_degenerate_flip(BMEdge *e, const float optimize_ normal_tri_v3(cross_exist, v->co, co_prev, co_next); normal_tri_v3(cross_optim, optimize_co, co_prev, co_next); - /* use a small value rather then zero so we don't flip a face in multiple steps + /* use a small value rather than zero so we don't flip a face in multiple steps * (first making it zero area, then flipping again) */ if (dot_v3v3(cross_exist, cross_optim) <= FLT_EPSILON) { // printf("no flip\n"); diff --git a/source/blender/draw/intern/draw_cache_extract_mesh.c b/source/blender/draw/intern/draw_cache_extract_mesh.c index c1f1c8b77e3..56633a6fecc 100644 --- a/source/blender/draw/intern/draw_cache_extract_mesh.c +++ b/source/blender/draw/intern/draw_cache_extract_mesh.c @@ -3327,7 +3327,7 @@ static void mesh_render_data_edge_flag(const MeshRenderData *mr, BMEdge *eed, Ed * specular highlights make it hard to see T55456#510873. * * This isn't ideal since it can't be used when mixing edge/face modes - * but it's still better then not being able to see the active face. */ + * but it's still better than not being able to see the active face. */ if (is_face_only_select_mode) { if (mr->efa_act != NULL) { if (BM_edge_in_face(eed, mr->efa_act)) { diff --git a/source/blender/draw/intern/shaders/common_fxaa_lib.glsl b/source/blender/draw/intern/shaders/common_fxaa_lib.glsl index 69af2d09af4..a87b4558227 100644 --- a/source/blender/draw/intern/shaders/common_fxaa_lib.glsl +++ b/source/blender/draw/intern/shaders/common_fxaa_lib.glsl @@ -68,7 +68,7 @@ NOTE the other tuning knobs are now in the shader function inputs! * * NOTES * ----------------------------------------------------------------------- - * 12 = slightly faster then FXAA 3.9 and higher edge quality (default) + * 12 = slightly faster than FXAA 3.9 and higher edge quality (default) * 13 = about same speed as FXAA 3.9 and better than 12 * 23 = closest to FXAA 3.9 visually and performance wise * _ = the lowest digit is directly related to performance diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 5005a41ada7..afc9d9884f3 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -4384,7 +4384,7 @@ static void ui_but_submenu_enable(uiBlock *block, uiBut *but) * avoid an extra lookup on 'prop' when its already available. * * When this kind of change won't disrupt branches, best look into making more - * of our UI functions take prop rather then propname. + * of our UI functions take prop rather than propname. */ static uiBut *ui_def_but_rna(uiBlock *block, int type, diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h index 5da3d9528f8..01eb8f95d18 100644 --- a/source/blender/editors/interface/interface_intern.h +++ b/source/blender/editors/interface/interface_intern.h @@ -531,7 +531,7 @@ struct uiBlock { void *evil_C; /** unit system, used a lot for numeric buttons so include here - * rather then fetching through the scene every time. */ + * rather than fetching through the scene every time. */ struct UnitSettings *unit; /** \note only accessed by color picker templates. */ ColorPickerData color_pickers; diff --git a/source/blender/editors/interface/interface_region_color_picker.c b/source/blender/editors/interface/interface_region_color_picker.c index 61349672f1c..f9a9e7182d2 100644 --- a/source/blender/editors/interface/interface_region_color_picker.c +++ b/source/blender/editors/interface/interface_region_color_picker.c @@ -141,7 +141,7 @@ bool ui_but_is_color_gamma(uiBut *but) void ui_scene_linear_to_color_picker_space(uiBut *but, float rgb[3]) { /* Map to color picking space for HSV values and HSV cube/circle, - * assuming it is more perceptually linear then the scene linear + * assuming it is more perceptually linear than the scene linear * space for intuitive color picking. */ if (!ui_but_is_color_gamma(but)) { IMB_colormanagement_scene_linear_to_color_picking_v3(rgb); diff --git a/source/blender/editors/mask/mask_add.c b/source/blender/editors/mask/mask_add.c index 770a53d8691..62f46c93bc7 100644 --- a/source/blender/editors/mask/mask_add.c +++ b/source/blender/editors/mask/mask_add.c @@ -311,7 +311,7 @@ static bool add_vertex_extrude(const bContext *C, float tangent_point[2]; float tangent_co[2]; bool do_cyclic_correct = false; - bool do_prev; /* use prev point rather then next?? */ + bool do_prev; /* use prev point rather than next?? */ if (!mask_layer) { return false; diff --git a/source/blender/editors/mesh/editmesh_inset.c b/source/blender/editors/mesh/editmesh_inset.c index 8d9837f123a..c4a44aa4a90 100644 --- a/source/blender/editors/mesh/editmesh_inset.c +++ b/source/blender/editors/mesh/editmesh_inset.c @@ -602,7 +602,7 @@ void MESH_OT_inset(wmOperatorType *ot) prop = RNA_def_float_distance( ot->srna, "thickness", 0.0f, 0.0f, 1e12f, "Thickness", "", 0.0f, 10.0f); - /* use 1 rather then 10 for max else dragging the button moves too far */ + /* use 1 rather than 10 for max else dragging the button moves too far */ RNA_def_property_ui_range(prop, 0.0, 1.0, 0.01, 4); prop = RNA_def_float_distance( diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c index 90ef42c6f48..dde422074a7 100644 --- a/source/blender/editors/mesh/editmesh_knife.c +++ b/source/blender/editors/mesh/editmesh_knife.c @@ -1600,7 +1600,7 @@ static void knife_find_line_hits(KnifeTool_OpData *kcd) * can end up being ~2000 units apart with an orthogonal perspective. * * (from ED_view3d_win_to_segment_clipped() above) - * this gives precision error; rather then solving properly + * this gives precision error; rather than solving properly * (which may involve using doubles everywhere!), * limit the distance between these points */ if (kcd->is_ortho && (kcd->vc.rv3d->persp != RV3D_CAMOB)) { diff --git a/source/blender/editors/mesh/editmesh_rip.c b/source/blender/editors/mesh/editmesh_rip.c index 62c646a81e4..66d57de70d3 100644 --- a/source/blender/editors/mesh/editmesh_rip.c +++ b/source/blender/editors/mesh/editmesh_rip.c @@ -130,7 +130,7 @@ static float edbm_rip_edge_side_measure( * from edge midpoint to face center. offset edge midpoint * by a small amount along this vector. */ - /* rather then the face center, get the middle of + /* rather than the face center, get the middle of * both edge verts connected to this one */ v1_other = BM_face_other_vert_loop(e_l->f, e->v2, e->v1)->v; v2_other = BM_face_other_vert_loop(e_l->f, e->v1, e->v2)->v; @@ -146,7 +146,7 @@ static float edbm_rip_edge_side_measure( sub_v2_v2v2(vec, cent, mid); normalize_v2_length(vec, 0.01f); - /* rather then adding to both verts, subtract from the mouse */ + /* rather than adding to both verts, subtract from the mouse */ sub_v2_v2v2(fmval_tweak, fmval, vec); score = len_v2v2(e_v1_co, e_v2_co); @@ -904,7 +904,7 @@ static int edbm_rip_invoke__edge(bContext *C, const wmEvent *event, Object *obed BM_ITER_ELEM (e, &eiter, v, BM_EDGES_OF_VERT) { if (!BM_edge_is_wire(e) && !BM_elem_flag_test(e, BM_ELEM_HIDDEN)) { - /* important to check selection rather then tag here + /* important to check selection rather than tag here * else we get feedback loop */ if (BM_elem_flag_test(e, BM_ELEM_SELECT)) { e_best = e; @@ -1042,7 +1042,7 @@ static int edbm_rip_invoke(bContext *C, wmOperator *op, const wmEvent *event) error_disconnected_vertices = false; /* note on selection: - * When calling edge split we operate on tagged edges rather then selected + * When calling edge split we operate on tagged edges rather than selected * this is important because the edges to operate on are extended by one, * but the selection is left alone. * diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 01e25d5281c..b9eac26eaa8 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -4030,7 +4030,7 @@ static int edbm_knife_cut_exec(bContext *C, wmOperator *op) /* for ED_view3d_project_float_object */ ED_view3d_init_mats_rv3d(obedit, region->regiondata); - /* TODO, investigate using index lookup for screen_vert_coords() rather then a hash table */ + /* TODO, investigate using index lookup for screen_vert_coords() rather than a hash table */ /* the floating point coordinates of verts in screen space will be * stored in a hash table according to the vertices pointer */ @@ -7245,7 +7245,7 @@ void MESH_OT_wireframe(wmOperatorType *ot) RNA_def_boolean(ot->srna, "use_replace", true, "Replace", "Remove original faces"); prop = RNA_def_float_distance( ot->srna, "thickness", 0.01f, 0.0f, 1e4f, "Thickness", "", 0.0f, 10.0f); - /* use 1 rather then 10 for max else dragging the button moves too far */ + /* use 1 rather than 10 for max else dragging the button moves too far */ RNA_def_property_ui_range(prop, 0.0, 1.0, 0.01, 4); RNA_def_float_distance(ot->srna, "offset", 0.01f, 0.0f, 1e4f, "Offset", "", 0.0f, 10.0f); RNA_def_boolean(ot->srna, diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index 0cf9fd7768d..e6d11398279 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -3777,7 +3777,7 @@ static void brush_puff(PEData *data, int point_index, float mouse_distance) /* translate (not rotate) the rest of the hair if its not selected */ { /* NOLINTNEXTLINE: readability-redundant-preprocessor */ -# if 0 /* kindof works but looks worse then what's below */ +# if 0 /* kindof works but looks worse than what's below */ /* Move the unselected point on a vector based on the * hair direction and the offset */ diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index 75f1e63ebb3..37af1fb6cda 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -467,7 +467,7 @@ typedef struct ProjPixel { /* Only used when the airbrush is disabled. * Store the max mask value to avoid painting over an area with a lower opacity * with an advantage that we can avoid touching the pixel at all, if the - * new mask value is lower then mask_accum */ + * new mask value is lower than mask_accum */ ushort *mask_accum; /* horrible hack, store tile valid flag pointer here to re-validate tiles @@ -2254,7 +2254,7 @@ static bool project_bucket_isect_circle(const float cent[2], /* Would normally to a simple intersection test, * however we know the bounds of these 2 already intersect so we only need to test * if the center is inside the vertical or horizontal bounds on either axis, - * this is even less work then an intersection test. + * this is even less work than an intersection test. */ #if 0 if (BLI_rctf_isect_pt_v(bucket_bounds, cent)) { @@ -2660,7 +2660,7 @@ static void project_bucket_clip_face(const bool is_ortho, * * There are a number of ways this could be done, currently it just collects all * intersecting verts, and line intersections, then sorts them clockwise, this is - * a lot easier then evaluating the geometry to do a correct clipping on both shapes. + * a lot easier than evaluating the geometry to do a correct clipping on both shapes. */ /* Add a bunch of points, we know must make up the convex hull @@ -2765,7 +2765,7 @@ static void project_bucket_clip_face(const bool is_ortho, /* Collect angles for every point around the center point */ -#if 0 /* uses a few more cycles then the above loop */ +#if 0 /* uses a few more cycles than the above loop */ for (int i = 0; i < (*tot); i++) { isectVCosSS[i][2] = angle_2d_clockwise(up, cent, isectVCosSS[i]); } @@ -3248,7 +3248,7 @@ static void project_paint_face_init(const ProjPaintState *ps, vCoSS[1] = ps->screenCoords[lt_vtri[1]]; vCoSS[2] = ps->screenCoords[lt_vtri[2]]; - /* PROJ_FACE_SCALE_SEAM must be slightly less then 1.0f */ + /* PROJ_FACE_SCALE_SEAM must be slightly less than 1.0f */ if (is_ortho) { scale_tri(insetCos, vCoSS, PROJ_FACE_SCALE_SEAM); } @@ -4895,7 +4895,7 @@ static void do_projectpaint_soften_f(ProjPaintState *ps, BlurKernel *kernel = ps->blurkernel; float *rgba = projPixel->newColor.f; - /* rather then painting, accumulate surrounding colors */ + /* rather than painting, accumulate surrounding colors */ zero_v4(rgba); for (yk = 0; yk < kernel->side; yk++) { @@ -4956,7 +4956,7 @@ static void do_projectpaint_soften(ProjPaintState *ps, /* convert to byte after */ float rgba[4]; - /* rather then painting, accumulate surrounding colors */ + /* rather than painting, accumulate surrounding colors */ zero_v4(rgba); for (yk = 0; yk < kernel->side; yk++) { @@ -6285,7 +6285,7 @@ static int texture_paint_image_from_view_exec(bContext *C, wmOperator *op) array += sizeof(rv3d->viewmat) / sizeof(float); is_ortho = ED_view3d_clip_range_get(depsgraph, v3d, rv3d, &array[0], &array[1], true); /* using float for a bool is dodgy but since its an extra member in the array... - * easier then adding a single bool prop */ + * easier than adding a single bool prop */ array[2] = is_ortho ? 1.0f : 0.0f; IDP_AddToGroup(idgroup, view_data); diff --git a/source/blender/editors/sculpt_paint/paint_stroke.c b/source/blender/editors/sculpt_paint/paint_stroke.c index 0da0b191537..75357214936 100644 --- a/source/blender/editors/sculpt_paint/paint_stroke.c +++ b/source/blender/editors/sculpt_paint/paint_stroke.c @@ -692,7 +692,7 @@ static float paint_space_stroke_spacing(bContext *C, } } else { - /* brushes can have a minimum size of 1.0 but with pressure it can be smaller then a pixel + /* brushes can have a minimum size of 1.0 but with pressure it can be smaller than a pixel * causing very high step sizes, hanging blender T32381. */ size_clamp = max_ff(1.0f, size); } diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c index f2d8f50299f..42b2806814b 100644 --- a/source/blender/editors/space_file/filesel.c +++ b/source/blender/editors/space_file/filesel.c @@ -86,7 +86,7 @@ FileSelectParams *ED_fileselect_get_params(struct SpaceFile *sfile) /** * \note RNA_struct_property_is_set_ex is used here because we want - * the previously used settings to be used here rather then overriding them */ + * the previously used settings to be used here rather than overriding them */ short ED_fileselect_set_params(SpaceFile *sfile) { FileSelectParams *params; diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index 6f36d3606bc..e36c7d6b6e7 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -1570,7 +1570,7 @@ static int image_replace_exec(bContext *C, wmOperator *op) RNA_string_get(op->ptr, "filepath", str); - /* we cant do much if the str is longer then FILE_MAX :/ */ + /* we cant do much if the str is longer than FILE_MAX :/ */ BLI_strncpy(sima->image->filepath, str, sizeof(sima->image->filepath)); if (sima->image->source == IMA_SRC_GENERATED) { diff --git a/source/blender/editors/space_info/textview.c b/source/blender/editors/space_info/textview.c index 5e0ba506226..a489216afd1 100644 --- a/source/blender/editors/space_info/textview.c +++ b/source/blender/editors/space_info/textview.c @@ -58,7 +58,7 @@ typedef struct TextViewDrawState { int scroll_ymin, scroll_ymax; int *xy; // [2] int *sel; // [2] - /* Bottom of view == 0, top of file == combine chars, end of line is lower then start. */ + /* Bottom of view == 0, top of file == combine chars, end of line is lower than start. */ int *mval_pick_offset; const int *mval; // [2] bool do_draw; diff --git a/source/blender/editors/space_node/node_view.c b/source/blender/editors/space_node/node_view.c index fca8086d36f..ef7e7874c63 100644 --- a/source/blender/editors/space_node/node_view.c +++ b/source/blender/editors/space_node/node_view.c @@ -231,7 +231,7 @@ static int snode_bg_viewmove_invoke(bContext *C, wmOperator *op, const wmEvent * NodeViewMove *nvm; Image *ima; ImBuf *ibuf; - const float pad = 32.0f; /* better be bigger then scrollbars */ + const float pad = 32.0f; /* better be bigger than scrollbars */ void *lock; diff --git a/source/blender/editors/space_sequencer/sequencer_scopes.c b/source/blender/editors/space_sequencer/sequencer_scopes.c index 1639870fee2..f5707d1ea65 100644 --- a/source/blender/editors/space_sequencer/sequencer_scopes.c +++ b/source/blender/editors/space_sequencer/sequencer_scopes.c @@ -34,7 +34,7 @@ #include "sequencer_intern.h" -/* XXX, why is this function better then BLI_math version? +/* XXX, why is this function better than BLI_math version? * only difference is it does some normalize after, need to double check on this - campbell */ static void rgb_to_yuv_normalized(const float rgb[3], float yuv[3]) { diff --git a/source/blender/editors/space_view3d/view3d_gizmo_ruler.c b/source/blender/editors/space_view3d/view3d_gizmo_ruler.c index 990b7952e39..fdba74ed3a6 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_ruler.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_ruler.c @@ -83,7 +83,7 @@ enum { RULERITEM_USE_ANGLE_ACTIVE = (1 << 1), }; -/* keep smaller then selection, since we may want click elsewhere without selecting a ruler */ +/* keep smaller than selection, since we may want click elsewhere without selecting a ruler */ #define RULER_PICK_DIST 12.0f #define RULER_PICK_DIST_SQ (RULER_PICK_DIST * RULER_PICK_DIST) diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index b05ff207e82..6faaedc1c4a 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -1097,7 +1097,7 @@ int view3d_opengl_select(ViewContext *vc, UI_Theme_Store(&theme_state); UI_SetTheme(SPACE_VIEW3D, RGN_TYPE_WINDOW); - /* Re-use cache (rect must be smaller then the cached) + /* Re-use cache (rect must be smaller than the cached) * other context is assumed to be unchanged */ if (GPU_select_is_cached()) { GPU_select_begin(buffer, bufsize, &rect, gpu_select_mode, 0); diff --git a/source/blender/editors/transform/transform_convert_mesh.c b/source/blender/editors/transform/transform_convert_mesh.c index f154c8d338e..6c0b03c6206 100644 --- a/source/blender/editors/transform/transform_convert_mesh.c +++ b/source/blender/editors/transform/transform_convert_mesh.c @@ -1611,7 +1611,7 @@ void special_aftertrans_update__mesh(bContext *UNUSED(C), TransInfo *t) bool has_face_sel = (bm->totfacesel != 0); if (tc->use_mirror_axis_any) { - /* Rather then adjusting the selection (which the user would notice) + /* Rather than adjusting the selection (which the user would notice) * tag all mirrored verts, then auto-merge those. */ BM_mesh_elem_hflag_disable_all(bm, BM_VERT, BM_ELEM_TAG, false); diff --git a/source/blender/editors/transform/transform_input.c b/source/blender/editors/transform/transform_input.c index 7e921d4fc3d..70ef5fcde7a 100644 --- a/source/blender/editors/transform/transform_input.c +++ b/source/blender/editors/transform/transform_input.c @@ -438,7 +438,7 @@ void initMouseInputMode(TransInfo *t, MouseInput *mi, MouseInputMode mode) } /* if we've allocated new data, free the old data - * less hassle then checking before every alloc above */ + * less hassle than checking before every alloc above */ if (mi_data_prev && (mi_data_prev != mi->data)) { MEM_freeN(mi_data_prev); } diff --git a/source/blender/imbuf/IMB_thumbs.h b/source/blender/imbuf/IMB_thumbs.h index a096301ed97..a013e7e38dd 100644 --- a/source/blender/imbuf/IMB_thumbs.h +++ b/source/blender/imbuf/IMB_thumbs.h @@ -48,7 +48,7 @@ typedef enum ThumbSource { THB_SOURCE_FONT, } ThumbSource; -/* don't generate thumbs for images bigger then this (100mb) */ +/* don't generate thumbs for images bigger than this (100mb) */ #define THUMB_SIZE_MAX (100 * 1024 * 1024) #define PREVIEW_RENDER_DEFAULT_HEIGHT 128 diff --git a/source/blender/imbuf/intern/jp2.c b/source/blender/imbuf/intern/jp2.c index 2244a9c3051..c7e4fe45a26 100644 --- a/source/blender/imbuf/intern/jp2.c +++ b/source/blender/imbuf/intern/jp2.c @@ -362,7 +362,7 @@ static ImBuf *imb_load_jp2_stream(opj_stream_t *stream, } struct ImBuf *ibuf = NULL; - bool use_float = false; /* for precision higher then 8 use float */ + bool use_float = false; /* for precision higher than 8 use float */ bool use_alpha = false; long signed_offsets[4] = {0, 0, 0, 0}; diff --git a/source/blender/makesdna/DNA_key_types.h b/source/blender/makesdna/DNA_key_types.h index 56a164e4f2c..782827578c2 100644 --- a/source/blender/makesdna/DNA_key_types.h +++ b/source/blender/makesdna/DNA_key_types.h @@ -107,7 +107,7 @@ typedef struct Key { char _pad2; /** Only used when (Key->type == KEY_NORMAL), this value is used as a time slider, - * rather then using the scenes time, this value can be animated to give greater control */ + * rather than using the scenes time, this value can be animated to give greater control */ float ctime; /** diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c index 269db1990b8..fa589597111 100644 --- a/source/blender/makesrna/intern/makesrna.c +++ b/source/blender/makesrna/intern/makesrna.c @@ -161,7 +161,7 @@ static int replace_if_different(const char *tmpfile, const char *dep_files[]) * assumes dep_files is in the same dir as makesrna.c, which is true for now. */ if (1) { - /* first check if makesrna.c is newer then generated files + /* first check if makesrna.c is newer than generated files * for development on makesrna.c you may want to disable this */ if (file_older(orgfile, __FILE__)) { REN_IF_DIFF; @@ -171,7 +171,7 @@ static int replace_if_different(const char *tmpfile, const char *dep_files[]) REN_IF_DIFF; } - /* now check if any files we depend on are newer then any generated files */ + /* now check if any files we depend on are newer than any generated files */ if (dep_files) { int pass; for (pass = 0; dep_files[pass]; pass++) { diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index f9490bd69c5..15a4a4e740e 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -5990,7 +5990,7 @@ char *RNA_path_from_ID_to_struct(PointerRNA *ptr) } } else if (RNA_struct_is_a(ptr->type, &RNA_PropertyGroup)) { - /* special case, easier to deal with here then in ptr->type->path() */ + /* special case, easier to deal with here than in ptr->type->path() */ return rna_path_from_ID_to_idpgroup(ptr); } else { diff --git a/source/blender/makesrna/intern/rna_armature.c b/source/blender/makesrna/intern/rna_armature.c index c0a46c65969..cc0c11fb089 100644 --- a/source/blender/makesrna/intern/rna_armature.c +++ b/source/blender/makesrna/intern/rna_armature.c @@ -654,7 +654,7 @@ static void rna_Armature_bones_next(CollectionPropertyIterator *iter) iter->valid = (internal->link != NULL); } -/* not essential, but much faster then the default lookup function */ +/* not essential, but much faster than the default lookup function */ static int rna_Armature_bones_lookup_string(PointerRNA *ptr, const char *key, PointerRNA *r_ptr) { bArmature *arm = (bArmature *)ptr->data; diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index 48ea894aba1..066bf309caa 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -187,7 +187,7 @@ const EnumPropertyItem rna_enum_object_modifier_type_items[] = { "WELD", ICON_AUTOMERGE_OFF, "Weld", - "Find groups of vertices closer then dist and merges them together"}, + "Find groups of vertices closer than dist and merges them together"}, {eModifierType_Wireframe, "WIREFRAME", ICON_MOD_WIREFRAME, diff --git a/source/blender/makesrna/intern/rna_pose.c b/source/blender/makesrna/intern/rna_pose.c index 8dd3670087a..942cd3d1a20 100644 --- a/source/blender/makesrna/intern/rna_pose.c +++ b/source/blender/makesrna/intern/rna_pose.c @@ -811,7 +811,7 @@ static int rna_PoseChannel_rotation_4d_editable(PointerRNA *ptr, int index) return PROP_EDITABLE; } -/* not essential, but much faster then the default lookup function */ +/* not essential, but much faster than the default lookup function */ static int rna_PoseBones_lookup_string(PointerRNA *ptr, const char *key, PointerRNA *r_ptr) { bPose *pose = (bPose *)ptr->data; diff --git a/source/blender/modifiers/intern/MOD_screw.c b/source/blender/modifiers/intern/MOD_screw.c index f5d933041bf..6521a0859e5 100644 --- a/source/blender/modifiers/intern/MOD_screw.c +++ b/source/blender/modifiers/intern/MOD_screw.c @@ -358,7 +358,7 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh * step_tot = ((step_tot + 1) * ltmd->iter) - (ltmd->iter - 1); /* Will the screw be closed? - * Note! smaller then `FLT_EPSILON * 100` + * Note! smaller than `FLT_EPSILON * 100` * gives problems with float precision so its never closed. */ if (fabsf(screw_ofs) <= (FLT_EPSILON * 100.0f) && fabsf(fabsf(angle) - ((float)M_PI * 2.0f)) <= (FLT_EPSILON * 100.0f) && step_tot > 3) { diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index bee4fef9d17..d6ab76dac60 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -4844,7 +4844,7 @@ static PyObject *pyrna_prop_collection_items(BPy_PropertyRNA *self) } } else { - /* A bit strange, but better then returning an empty list. */ + /* A bit strange, but better than returning an empty list. */ PyTuple_SET_ITEM(item, 0, PyLong_FromLong(i)); } PyTuple_SET_ITEM(item, 1, pyrna_struct_CreatePyObject(&itemptr)); @@ -6219,7 +6219,7 @@ static PyObject *pyrna_func_call(BPy_FunctionRNA *self, PyObject *args, PyObject /* Check if we gave args that don't exist in the function * Printing the error is slow, but it should only happen when developing. - * The "if" below is quick check to make sure less keyword args were passed then we gave. + * The "if" below is quick check to make sure less keyword args were passed than we gave. * (Don't overwrite the error if we have one, * otherwise can skip important messages and confuse with args). */ |