diff options
139 files changed, 239 insertions, 238 deletions
diff --git a/build_files/cmake/Modules/FindOpenCOLLADA.cmake b/build_files/cmake/Modules/FindOpenCOLLADA.cmake index 00898923fbd..4e83fd04f38 100644 --- a/build_files/cmake/Modules/FindOpenCOLLADA.cmake +++ b/build_files/cmake/Modules/FindOpenCOLLADA.cmake @@ -46,7 +46,7 @@ SET(_opencollada_FIND_COMPONENTS ) # Fedora openCOLLADA package links these statically -# note that order is important here ot it wont link +# note that order is important here or it won't link SET(_opencollada_FIND_STATIC_COMPONENTS buffer ftoa diff --git a/build_files/cmake/Modules/FindPythonLibsUnix.cmake b/build_files/cmake/Modules/FindPythonLibsUnix.cmake index 78f8e03807f..a6fb463432b 100644 --- a/build_files/cmake/Modules/FindPythonLibsUnix.cmake +++ b/build_files/cmake/Modules/FindPythonLibsUnix.cmake @@ -44,7 +44,7 @@ SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic" CACHE STRING "Linker flags for p MARK_AS_ADVANCED(PYTHON_LINKFLAGS) -# if the user passes these defines as args, we dont want to overwrite +# if the user passes these defines as args, we don't want to overwrite SET(_IS_INC_DEF OFF) SET(_IS_INC_CONF_DEF OFF) SET(_IS_LIB_DEF OFF) @@ -143,7 +143,7 @@ IF((NOT _IS_INC_DEF) OR (NOT _IS_INC_CONF_DEF) OR (NOT _IS_LIB_DEF) OR (NOT _IS_ SET(_PYTHON_ABI_FLAGS "${_CURRENT_ABI_FLAGS}") break() ELSE() - # ensure we dont find values from 2 different ABI versions + # ensure we don't find values from 2 different ABI versions IF(NOT _IS_INC_DEF) UNSET(PYTHON_INCLUDE_DIR CACHE) ENDIF() diff --git a/build_files/cmake/clang_array_check.py b/build_files/cmake/clang_array_check.py index 57311623cda..09ff4f413db 100644 --- a/build_files/cmake/clang_array_check.py +++ b/build_files/cmake/clang_array_check.py @@ -305,7 +305,7 @@ def file_check_arg_sizes(tu): for i, node_child in enumerate(children): children = list(node_child.get_children()) - # skip if we dont have an index... + # skip if we don't have an index... size_def = args_size_definition.get(i, -1) if size_def == -1: @@ -354,7 +354,7 @@ def file_check_arg_sizes(tu): filepath # always the same but useful when running threaded )) - # we dont really care what we are looking at, just scan entire file for + # we don't really care what we are looking at, just scan entire file for # function calls. def recursive_func_call_check(node): diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 4fc01c55ad0..8ad3f77c7d3 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -694,7 +694,7 @@ macro(message_first_run) endmacro() # when we have warnings as errors applied globally this -# needs to be removed for some external libs which we dont maintain. +# needs to be removed for some external libs which we don't maintain. # utility macro macro(remove_cc_flag @@ -794,7 +794,7 @@ macro(remove_extra_strict_flags) endmacro() # note, we can only append flags on a single file so we need to negate the options. -# at the moment we cant shut up ffmpeg deprecations, so use this, but will +# at the moment we can't shut up ffmpeg deprecations, so use this, but will # probably add more removals here. macro(remove_strict_c_flags_file filenames) diff --git a/intern/cycles/test/CMakeLists.txt b/intern/cycles/test/CMakeLists.txt index 51cc47fa704..65a692acd03 100644 --- a/intern/cycles/test/CMakeLists.txt +++ b/intern/cycles/test/CMakeLists.txt @@ -15,7 +15,7 @@ if(WITH_GTESTS) Include(GTestTesting) - # Otherwise we get warnings here that we cant fix in external projects + # Otherwise we get warnings here that we can't fix in external projects remove_strict_flags() endif() diff --git a/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp b/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp index b836f256b27..11134ad1054 100644 --- a/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp +++ b/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp @@ -160,7 +160,7 @@ GHOST_TSuccess GHOST_DisplayManagerSDL::setCurrentDisplaySetting( else { /* this is a problem for the BGE player :S, perhaps SDL2 will resolve at some point. * we really need SDL_SetDisplayModeForDisplay() to become an API func! - campbell */ - printf("no windows available, cant fullscreen\n"); + printf("no windows available, can't fullscreen\n"); /* do not fail, we will try again later when the window is created - wander */ return GHOST_kSuccess; diff --git a/intern/ghost/intern/GHOST_SystemSDL.cpp b/intern/ghost/intern/GHOST_SystemSDL.cpp index 8862d0457f2..eccef18bee2 100644 --- a/intern/ghost/intern/GHOST_SystemSDL.cpp +++ b/intern/ghost/intern/GHOST_SystemSDL.cpp @@ -376,7 +376,7 @@ void GHOST_SystemSDL::processEvent(SDL_Event *sdl_event) bounds.wrapPoint(x_new, y_new, 8, window->getCursorGrabAxis()); window->getCursorGrabAccum(x_accum, y_accum); - // cant use setCursorPosition because the mouse may have no focus! + // can't use setCursorPosition because the mouse may have no focus! if (x_new != x_root || y_new != y_root) { if (1) { //xme.time > m_last_warp) { /* when wrapping we don't need to add an event because the diff --git a/intern/ghost/intern/GHOST_WindowSDL.cpp b/intern/ghost/intern/GHOST_WindowSDL.cpp index dcb1ab8c78c..ff0c506feb7 100644 --- a/intern/ghost/intern/GHOST_WindowSDL.cpp +++ b/intern/ghost/intern/GHOST_WindowSDL.cpp @@ -556,7 +556,7 @@ static SDL_Cursor *sdl_ghost_CreateCursor( return cursor; } -/* TODO, this is currently never freed but it wont leak either. */ +/* TODO, this is currently never freed but it won't leak either. */ static SDL_Cursor *getStandardCursorShape(GHOST_TStandardCursor shape) { if (sdl_std_cursor_array[0] == NULL) { diff --git a/intern/iksolver/intern/IK_QJacobianSolver.cpp b/intern/iksolver/intern/IK_QJacobianSolver.cpp index 6c2c0bacf48..b8ad0b2c09c 100644 --- a/intern/iksolver/intern/IK_QJacobianSolver.cpp +++ b/intern/iksolver/intern/IK_QJacobianSolver.cpp @@ -89,7 +89,7 @@ bool IK_QJacobianSolver::Setup(IK_QSegment *root, std::list<IK_QTask *> &tasks) if (num_dof == 0) return false; - // compute task id's and assing weights to task + // compute task ids and assign weights to task int primary_size = 0, primary = 0; int secondary_size = 0, secondary = 0; double primary_weight = 0.0, secondary_weight = 0.0; @@ -237,7 +237,7 @@ void IK_QJacobianSolver::ConstrainPoleVector(IK_QSegment *root, std::list<IK_QTa bool IK_QJacobianSolver::UpdateAngles(double &norm) { - // assing each segment a unique id for the jacobian + // assign each segment a unique id for the jacobian std::vector<IK_QSegment *>::iterator seg; IK_QSegment *qseg, *minseg = NULL; double minabsdelta = 1e10, absdelta; diff --git a/release/scripts/modules/rna_keymap_ui.py b/release/scripts/modules/rna_keymap_ui.py index 365d6c0087f..b42539ac44a 100644 --- a/release/scripts/modules/rna_keymap_ui.py +++ b/release/scripts/modules/rna_keymap_ui.py @@ -271,7 +271,7 @@ def draw_filtered(display_keymaps, filter_type, filter_text, layout): # keymap items must match against all. kmi_test_type = [] - # initialize? - so if a if a kmi has a MOD assigned it wont show up. + # initialize? - so if a kmi has a MOD assigned it won't show up. # for kv in key_mod.values(): # kmi_test_dict[kv] = {False} diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h index 092eec578c9..7d553b68185 100644 --- a/source/blender/blenkernel/BKE_DerivedMesh.h +++ b/source/blender/blenkernel/BKE_DerivedMesh.h @@ -345,7 +345,7 @@ void DM_interp_vert_data(struct DerivedMesh *source, void mesh_get_mapped_verts_coords(struct Mesh *me_eval, float (*r_cos)[3], const int totcos); -/* same as above but wont use render settings */ +/* same as above but won't use render settings */ struct Mesh *editbmesh_get_eval_cage(struct Depsgraph *depsgraph, struct Scene *scene, struct Object *, diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h index 48b4540e3d9..0b4e1191956 100644 --- a/source/blender/blenkernel/BKE_modifier.h +++ b/source/blender/blenkernel/BKE_modifier.h @@ -324,7 +324,7 @@ typedef struct ModifierTypeInfo { /** * True when a deform modifier uses normals, the requiredDataMask - * cant be used here because that refers to a normal layer whereas + * can't be used here because that refers to a normal layer whereas * in this case we need to know if the deform modifier uses normals. * * this is needed because applying 2 deform modifiers will give the diff --git a/source/blender/blenkernel/BKE_pointcache.h b/source/blender/blenkernel/BKE_pointcache.h index 170eb4ba662..8731162b720 100644 --- a/source/blender/blenkernel/BKE_pointcache.h +++ b/source/blender/blenkernel/BKE_pointcache.h @@ -33,7 +33,7 @@ extern "C" { #endif /* Point cache clearing option, for BKE_ptcache_id_clear, before - * and after are non inclusive (they wont remove the cfra) */ + * and after are non-inclusive (they won't remove the cfra) */ #define PTCACHE_CLEAR_ALL 0 #define PTCACHE_CLEAR_FRAME 1 #define PTCACHE_CLEAR_BEFORE 2 diff --git a/source/blender/blenkernel/intern/DerivedMesh.cc b/source/blender/blenkernel/intern/DerivedMesh.cc index 3150e096a73..6caed3936d4 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.cc +++ b/source/blender/blenkernel/intern/DerivedMesh.cc @@ -1572,7 +1572,7 @@ static void editbmesh_calc_modifier_final_normals(Mesh *mesh_final, /* BMESH_ONLY, ensure tessface's used for drawing, * but don't recalculate if the last modifier in the stack gives us tessfaces * check if the derived meshes are DM_TYPE_EDITBMESH before calling, this isn't essential - * but quiets annoying error messages since tessfaces wont be created. */ + * but quiets annoying error messages since tessfaces won't be created. */ if (final_datamask->fmask & CD_MASK_MFACE) { if (mesh_final->edit_mesh == nullptr) { BKE_mesh_tessface_ensure(mesh_final); diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index 2cd089545e8..a57e1d6b2dd 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -2381,7 +2381,7 @@ static void pose_proxy_sync(Object *ob, Object *from, int layer_protected) return; } - /* in some cases when rigs change, we cant synchronize + /* in some cases when rigs change, we can't synchronize * to avoid crashing check for possible errors here */ for (pchan = pose->chanbase.first; pchan; pchan = pchan->next) { if (pchan->bone->layer & layer_protected) { diff --git a/source/blender/blenkernel/intern/blender_copybuffer.c b/source/blender/blenkernel/intern/blender_copybuffer.c index ec8962d5f6d..dfd49a347ca 100644 --- a/source/blender/blenkernel/intern/blender_copybuffer.c +++ b/source/blender/blenkernel/intern/blender_copybuffer.c @@ -106,7 +106,7 @@ bool BKE_copybuffer_read(Main *bmain_dst, /* Append, rather than linking. */ Library *lib = BLI_findstring(&bmain_dst->libraries, libname, offsetof(Library, filepath_abs)); BKE_library_make_local(bmain_dst, lib, NULL, true, false); - /* Important we unset, otherwise these object wont + /* Important we unset, otherwise these object won't * link into other scenes from this blend file. */ BKE_main_id_tag_all(bmain_dst, LIB_TAG_PRE_EXISTING, false); @@ -166,7 +166,7 @@ int BKE_copybuffer_paste(bContext *C, lib = BLI_findstring(&bmain->libraries, libname, offsetof(Library, filepath_abs)); BKE_library_make_local(bmain, lib, NULL, true, false); - /* important we unset, otherwise these object wont + /* important we unset, otherwise these object won't * link into other scenes from this blend file */ BKE_main_id_tag_all(bmain, LIB_TAG_PRE_EXISTING, false); diff --git a/source/blender/blenkernel/intern/blendfile.c b/source/blender/blenkernel/intern/blendfile.c index 54fd3f55c31..e335dd4bdcd 100644 --- a/source/blender/blenkernel/intern/blendfile.c +++ b/source/blender/blenkernel/intern/blendfile.c @@ -269,7 +269,7 @@ static void setup_app_data(bContext *C, } /* We need to tag this here because events may be handled immediately after. - * only the current screen is important because we wont have to handle + * only the current screen is important because we won't have to handle * events from multiple screens at once.*/ if (curscreen) { BKE_screen_gizmo_tag_refresh(curscreen); diff --git a/source/blender/blenkernel/intern/bpath.c b/source/blender/blenkernel/intern/bpath.c index 47427beccba..f26a9f06697 100644 --- a/source/blender/blenkernel/intern/bpath.c +++ b/source/blender/blenkernel/intern/bpath.c @@ -345,7 +345,7 @@ static bool missing_files_find__recursive(char *filename_new, BLI_join_dirfile(path, sizeof(path), dirname, de->d_name); if (BLI_stat(path, &status) == -1) { - continue; /* cant stat, don't bother with this file, could print debug info here */ + continue; /* can't stat, don't bother with this file, could print debug info here */ } if (S_ISREG(status.st_mode)) { /* is file */ @@ -812,7 +812,7 @@ bool BKE_bpath_relocate_visitor(void *pathbase_v, char *path_dst, const char *pa if (BLI_path_abs(filepath, base_old)) { /* Path was relative and is now absolute. Remap. * Important BLI_path_normalize runs before the path is made relative - * because it wont work for paths that start with "//../" */ + * because it won't work for paths that start with "//../" */ BLI_path_normalize(base_new, filepath); BLI_path_rel(filepath, base_new); BLI_strncpy(path_dst, filepath, FILE_MAX); @@ -850,7 +850,7 @@ static bool bpath_list_append(void *userdata, char *UNUSED(path_dst), const char static bool bpath_list_restore(void *userdata, char *path_dst, const char *path_src) { - /* assume ls->first wont be NULL because the number of paths can't change! + /* assume ls->first won't be NULL because the number of paths can't change! * (if they do caller is wrong) */ ListBase *ls = userdata; struct PathStore *path_store = ls->first; diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index 42af3a391ed..788a51257bf 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -5185,7 +5185,7 @@ static int dynamicPaint_prepareEffectStep(struct Depsgraph *depsgraph, } /* Get number of required steps using average point distance - * so that just a few ultra close pixels wont up substeps to max. */ + * so that just a few ultra close pixels won't increase substeps to max. */ /* adjust number of required substep by fastest active effect */ if (surface->effect & MOD_DPAINT_EFFECT_DO_SPREAD) { diff --git a/source/blender/blenkernel/intern/editmesh_bvh.c b/source/blender/blenkernel/intern/editmesh_bvh.c index c4f855dd8c2..9e0e1933a00 100644 --- a/source/blender/blenkernel/intern/editmesh_bvh.c +++ b/source/blender/blenkernel/intern/editmesh_bvh.c @@ -117,7 +117,7 @@ BMBVHTree *BKE_bmbvh_new_ex(BMesh *bm, for (int i = 0; i < looptris_tot; i++) { if (test_fn) { - /* note, the arrays wont align now! take care */ + /* Note: the arrays won't align now! Take care. */ f_test = looptris[i][0]->f; if (f_test != f_test_prev) { test_fn_ret = test_fn(f_test, user_data); diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index dad518ec696..7a3619154a6 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -5359,7 +5359,7 @@ int BKE_image_user_frame_get(const ImageUser *iuser, int cfra, bool *r_is_in_ran } } - /* important to apply after else we cant loop on frames 100 - 110 for eg. */ + /* important to apply after else we can't loop on frames 100 - 110 for eg. */ framenr += iuser->offset; return framenr; diff --git a/source/blender/blenkernel/intern/lib_id.c b/source/blender/blenkernel/intern/lib_id.c index f26b85338f0..b7cacba20b3 100644 --- a/source/blender/blenkernel/intern/lib_id.c +++ b/source/blender/blenkernel/intern/lib_id.c @@ -1952,7 +1952,7 @@ void BKE_library_make_local(Main *bmain, } /* The check on the fourth line (LIB_TAG_PRE_EXISTING) is done so it's possible to tag data * you don't want to be made local, used for appending data, - * so any libdata already linked wont become local (very nasty + * so any libdata already linked won't become local (very nasty * to discover all your links are lost after appending). * Also, never ever make proxified objects local, would not make any sense. */ /* Some more notes: diff --git a/source/blender/blenkernel/intern/mesh_convert.c b/source/blender/blenkernel/intern/mesh_convert.c index 31cb21b0f00..934f9ce5018 100644 --- a/source/blender/blenkernel/intern/mesh_convert.c +++ b/source/blender/blenkernel/intern/mesh_convert.c @@ -1704,7 +1704,7 @@ void BKE_mesh_nomain_to_mesh(Mesh *mesh_src, tmp.texflag &= ~ME_AUTOSPACE_EVALUATED; /* Clear any run-time data. - * Even though this mesh wont typically have run-time data, the Python API can for e.g. + * Even though this mesh won't typically have run-time data, the Python API can for e.g. * create loop-triangle cache here, which is confusing when left in the mesh, see: T81136. */ BKE_mesh_runtime_clear_geometry(&tmp); diff --git a/source/blender/blenkernel/intern/mesh_validate.c b/source/blender/blenkernel/intern/mesh_validate.c index 6b34604b1ac..3570b1dd933 100644 --- a/source/blender/blenkernel/intern/mesh_validate.c +++ b/source/blender/blenkernel/intern/mesh_validate.c @@ -1441,7 +1441,7 @@ static void mesh_calc_edges_mdata(MVert *UNUSED(allvert), med->flag |= ME_LOOSEEDGE; } - /* order is swapped so extruding this edge as a surface wont flip face normals + /* order is swapped so extruding this edge as a surface won't flip face normals * with cyclic curves */ if (ed->v1 + 1 != ed->v2) { SWAP(uint, med->v1, med->v2); diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 52cdf35085a..27222aeae4d 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -2890,7 +2890,7 @@ void BKE_object_make_proxy(Main *bmain, Object *ob, Object *target, Object *cob) /* copy transform * - cob means this proxy comes from a collection, just apply the matrix - * so the object wont move from its dupli-transform. + * so the object won't move from its dupli-transform. * * - no cob means this is being made from a linked object, * this is closer to making a copy of the object - in-place. */ diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index a873ecec6f1..9381baa7506 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -1437,7 +1437,7 @@ static void do_particle_interpolation(ParticleSystem *psys, int point_vel = (point && point->keys->vel); float real_t, dfra, keytime, invdt = 1.0f; - /* billboards wont fill in all of these, so start cleared */ + /* billboards won't fill in all of these, so start cleared */ memset(keys, 0, sizeof(keys)); /* interpret timing and find keys */ diff --git a/source/blender/blenkernel/intern/particle_distribute.c b/source/blender/blenkernel/intern/particle_distribute.c index ad617b4198b..13f0cb28428 100644 --- a/source/blender/blenkernel/intern/particle_distribute.c +++ b/source/blender/blenkernel/intern/particle_distribute.c @@ -481,7 +481,7 @@ static void distribute_from_verts_exec(ParticleTask *thread, ParticleData *pa, i mface = ctx->mesh->mface; - int rng_skip_tot = PSYS_RND_DIST_SKIP; /* count how many rng_* calls wont need skipping */ + int rng_skip_tot = PSYS_RND_DIST_SKIP; /* count how many rng_* calls won't need skipping */ /* TODO_PARTICLE - use original index */ pa->num = ctx->index[p]; @@ -538,7 +538,7 @@ static void distribute_from_faces_exec(ParticleTask *thread, ParticleData *pa, i float randu, randv; int distr = ctx->distr; int i; - int rng_skip_tot = PSYS_RND_DIST_SKIP; /* count how many rng_* calls wont need skipping */ + int rng_skip_tot = PSYS_RND_DIST_SKIP; /* count how many rng_* calls won't need skipping */ MFace *mface; @@ -587,7 +587,7 @@ static void distribute_from_volume_exec(ParticleTask *thread, ParticleData *pa, float cur_d, min_d, randu, randv; int distr = ctx->distr; int i, intersect, tot; - int rng_skip_tot = PSYS_RND_DIST_SKIP; /* count how many rng_* calls wont need skipping */ + int rng_skip_tot = PSYS_RND_DIST_SKIP; /* count how many rng_* calls won't need skipping */ MFace *mface; MVert *mvert = mesh->mvert; @@ -692,7 +692,7 @@ static void distribute_children_exec(ParticleTask *thread, ChildParticle *cpa, i float randu, randv; int cfrom = ctx->cfrom; int i; - int rng_skip_tot = PSYS_RND_DIST_SKIP; /* count how many rng_* calls wont need skipping */ + int rng_skip_tot = PSYS_RND_DIST_SKIP; /* count how many rng_* calls won't need skipping */ MFace *mf; diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 2dc752d57e1..d236dbbf101 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -1007,7 +1007,7 @@ void psys_get_birth_coords( mul_qt_v3(q_imat, rot_vec_local); /* vtan_local */ - copy_v3_v3(vtan_local, vtan); /* flips, cant use */ + copy_v3_v3(vtan_local, vtan); /* flips, can't use */ mul_qt_v3(q_imat, vtan_local); /* ensure orthogonal matrix (rot_vec aligned) */ diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c index 77dde3a921a..9f316ec60c0 100644 --- a/source/blender/blenkernel/intern/pbvh.c +++ b/source/blender/blenkernel/intern/pbvh.c @@ -2056,7 +2056,7 @@ bool ray_face_intersection_tri(const float ray_start[3], return false; } -/* Take advantage of the fact we know this wont be an intersection. +/* Take advantage of the fact we know this won't be an intersection. * Just handle ray-tri edges. */ static float dist_squared_ray_to_tri_v3_fast(const float ray_origin[3], const float ray_direction[3], diff --git a/source/blender/blenkernel/intern/report.c b/source/blender/blenkernel/intern/report.c index 43ab1a71647..c877ec6b6b0 100644 --- a/source/blender/blenkernel/intern/report.c +++ b/source/blender/blenkernel/intern/report.c @@ -107,7 +107,7 @@ void BKE_report(ReportList *reports, ReportType type, const char *_message) int len; const char *message = TIP_(_message); - /* in background mode always print otherwise there are cases the errors wont be displayed, + /* in background mode always print otherwise there are cases the errors won't be displayed, * but still add to the report list since this is used for python exception handling */ if (G.background || !reports || ((reports->flag & RPT_PRINT) && (type >= reports->printlevel))) { printf("%s: %s\n", BKE_report_type_str(type), message); diff --git a/source/blender/blenkernel/intern/unit.c b/source/blender/blenkernel/intern/unit.c index 5cf76bb6452..c2fb5ef4238 100644 --- a/source/blender/blenkernel/intern/unit.c +++ b/source/blender/blenkernel/intern/unit.c @@ -152,7 +152,7 @@ static struct bUnitDef buMetricLenDef[] = { {"micrometer", "micrometers", "µm", "um", "Micrometers", "MICROMETERS", UN_SC_UM, 0.0, B_UNIT_DEF_NONE}, /* These get displayed because of float precision problems in the transform header, - * could work around, but for now probably people wont use these. */ + * could work around, but for now probably people won't use these. */ #if 0 {"nanometer", "Nanometers", "nm", NULL, 0.000000001, 0.0, B_UNIT_DEF_NONE}, {"picometer", "Picometers", "pm", NULL, 0.000000000001, 0.0, B_UNIT_DEF_NONE}, @@ -988,7 +988,7 @@ static int unit_scale_str(char *str, memcpy(str_found, str_tmp, len_num); /* Without the string terminator. */ } - /* Since the null terminator wont be moved if the stringlen_max + /* Since the null terminator won't be moved if the stringlen_max * was not long enough to fit everything in it. */ str[len_max - 1] = '\0'; return found_ofs + len_num; @@ -1136,8 +1136,8 @@ bool BKE_unit_replace_string( strncpy(str, str_tmp, len_max); } else { - /* BLI_snprintf would not fit into str_tmp, cant do much in this case. - * Check for this because otherwise BKE_unit_replace_string could call its self forever. */ + /* BLI_snprintf would not fit into str_tmp, can't do much in this case. + * Check for this because otherwise BKE_unit_replace_string could call itself forever. */ return changed; } diff --git a/source/blender/blenkernel/intern/volume.cc b/source/blender/blenkernel/intern/volume.cc index 5e444e66a15..5fc55aad6a2 100644 --- a/source/blender/blenkernel/intern/volume.cc +++ b/source/blender/blenkernel/intern/volume.cc @@ -745,7 +745,7 @@ static int volume_sequence_frame(const Depsgraph *depsgraph, const Volume *volum } } - /* Important to apply after, else we cant loop on e.g. frames 100 - 110. */ + /* Important to apply after, else we can't loop on e.g. frames 100 - 110. */ frame += frame_offset; return frame; diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt index 91e3453d021..677df9db026 100644 --- a/source/blender/blenlib/CMakeLists.txt +++ b/source/blender/blenlib/CMakeLists.txt @@ -20,7 +20,7 @@ set(INC . - # ../blenkernel # dont add this back! + # ../blenkernel # don't add this back! ../makesdna ../../../intern/atomic ../../../intern/eigen diff --git a/source/blender/blenlib/intern/BLI_dynstr.c b/source/blender/blenlib/intern/BLI_dynstr.c index 7b25fecfa45..5255e8b9902 100644 --- a/source/blender/blenlib/intern/BLI_dynstr.c +++ b/source/blender/blenlib/intern/BLI_dynstr.c @@ -166,7 +166,7 @@ void BLI_dynstr_vappendf(DynStr *__restrict ds, const char *__restrict format, v message = MEM_callocN(sizeof(char) * len, "BLI_dynstr_appendf"); } - /* cant reuse the same args, so work on a copy */ + /* can't reuse the same args, so work on a copy */ va_copy(args_cpy, args); retval = vsnprintf(message, len, format, args_cpy); va_end(args_cpy); diff --git a/source/blender/blenlib/intern/array_store.c b/source/blender/blenlib/intern/array_store.c index b694f9c7fc0..250915383cf 100644 --- a/source/blender/blenlib/intern/array_store.c +++ b/source/blender/blenlib/intern/array_store.c @@ -192,7 +192,7 @@ /* 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. + * however, this code runs won't run in tests unless it's ~1.1 ugh. * so lower only to check splitting works. */ # define BCHUNK_SIZE_MAX_MUL 2 diff --git a/source/blender/blenlib/intern/kdtree_impl.h b/source/blender/blenlib/intern/kdtree_impl.h index c92dc2e95a3..2a0e8b3ec68 100644 --- a/source/blender/blenlib/intern/kdtree_impl.h +++ b/source/blender/blenlib/intern/kdtree_impl.h @@ -882,7 +882,7 @@ static void deduplicate_recursive(const struct DeDuplicateParams *p, uint i) * although it can still be used as a target. * \returns The number of merges found (includes any merges already in the \a duplicates array). * - * \note Merging is always a single step (target indices wont be marked for merging). + * \note Merging is always a single step (target indices won't be marked for merging). */ int BLI_kdtree_nd_(calc_duplicates_fast)(const KDTree *tree, const float range, diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c index 7de6e9f843a..de50ae27b94 100644 --- a/source/blender/blenlib/intern/math_geom.c +++ b/source/blender/blenlib/intern/math_geom.c @@ -6249,7 +6249,7 @@ float cubic_tangent_factor_circle_v3(const float tan_l[3], const float tan_r[3]) const float tan_dot = dot_v3v3(tan_l, tan_r); if (tan_dot > 1.0f - eps) { - /* no angle difference (use fallback, length wont make any difference) */ + /* no angle difference (use fallback, length won't make any difference) */ return (1.0f / 3.0f) * 0.75f; } if (tan_dot < -1.0f + eps) { diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c index e8027836ed6..f3c348b2b44 100644 --- a/source/blender/blenlib/intern/path_util.c +++ b/source/blender/blenlib/intern/path_util.c @@ -180,7 +180,7 @@ void BLI_path_normalize(const char *relabase, char *path) else { if (path[0] == '/' && path[1] == '/') { if (path[2] == '\0') { - return; /* path is "//" - cant clean it */ + return; /* path is "//" - can't clean it */ } path = path + 2; /* leave the initial "//" untouched */ } @@ -236,7 +236,7 @@ void BLI_path_normalize(const char *relabase, char *path) } else { /* support for odd paths: eg /../home/me --> /home/me - * this is a valid path in blender but we cant handle this the usual way below + * this is a valid path in blender but we can't handle this the usual way below * simply strip this prefix then evaluate the path as usual. * pythons os.path.normpath() does this */ @@ -1646,8 +1646,8 @@ bool BLI_path_filename_ensure(char *filepath, size_t maxlen, const char *filenam /** * Converts `/foo/bar.txt` to `/foo/` and `bar.txt` * - * - Wont change \a string. - * - Wont create any directories. + * - Won't change \a string. + * - Won't create any directories. * - Doesn't use CWD, or deal with relative paths. * - Only fill's in \a dir and \a file when they are non NULL. */ diff --git a/source/blender/blenlib/intern/polyfill_2d_beautify.c b/source/blender/blenlib/intern/polyfill_2d_beautify.c index 98fa5c872b0..7425bab885c 100644 --- a/source/blender/blenlib/intern/polyfill_2d_beautify.c +++ b/source/blender/blenlib/intern/polyfill_2d_beautify.c @@ -320,7 +320,7 @@ static void polyedge_rotate(struct HalfEdge *edges, struct HalfEdge *e) * The intention is that this calculates the output of #BLI_polyfill_calc * \note assumes the \a coords form a boundary, * so any edges running along contiguous (wrapped) indices, - * are ignored since the edges wont share 2 faces. + * are ignored since the edges won't share 2 faces. */ void BLI_polyfill_beautify(const float (*coords)[2], const uint coords_tot, diff --git a/source/blender/blenlib/tests/BLI_stack_test.cc b/source/blender/blenlib/tests/BLI_stack_test.cc index 1fef5998b99..a2650e5509d 100644 --- a/source/blender/blenlib/tests/BLI_stack_test.cc +++ b/source/blender/blenlib/tests/BLI_stack_test.cc @@ -137,7 +137,7 @@ TEST(stack, Clear) BLI_stack_clear(stack); EXPECT_TRUE(BLI_stack_is_empty(stack)); - /* and again, this time check its valid */ + /* and again, this time check it is valid */ for (in = 0; in < tot; in++) { BLI_stack_push(stack, (void *)&in); } @@ -150,7 +150,7 @@ TEST(stack, Clear) EXPECT_TRUE(BLI_stack_is_empty(stack)); - /* without this, we wont test case when mixed free/used */ + /* without this, we won't test case when mixed free/used */ tot /= 2; } diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 47ed4e5c06f..dab630d451c 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -5184,7 +5184,7 @@ static void library_link_end(Main *mainl, blo_join_main((*fd)->mainlist); mainvar = (*fd)->mainlist->first; - mainl = NULL; /* blo_join_main free's mainl, cant use anymore */ + mainl = NULL; /* blo_join_main free's mainl, can't use anymore */ lib_link_all(*fd, mainvar); after_liblink_merged_bmain_process(mainvar); diff --git a/source/blender/blenloader/intern/versioning_260.c b/source/blender/blenloader/intern/versioning_260.c index 7c5eefa60f7..fe3d7f8e98f 100644 --- a/source/blender/blenloader/intern/versioning_260.c +++ b/source/blender/blenloader/intern/versioning_260.c @@ -861,7 +861,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) int i; for (i = 0; i < 3; i++) { if ((ob->dsize[i] == 0.0f) || /* simple case, user never touched dsize */ - (ob->scale[i] == 0.0f)) /* cant scale the dsize to give a non zero result, + (ob->scale[i] == 0.0f)) /* can't scale the dsize to give a non zero result, * so fallback to 1.0f */ { ob->dscale[i] = 1.0f; diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index 38c00b3f132..fbcf690a773 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -605,7 +605,7 @@ static void writelist_id(WriteData *wd, int filecode, const char *structname, co * \{ */ /** - * Take care using 'use_active_win', since we wont want the currently active window + * Take care using 'use_active_win', since we won't want the currently active window * to change which scene renders (currently only used for undo). */ static void current_screen_compat(Main *mainvar, diff --git a/source/blender/bmesh/bmesh_class.h b/source/blender/bmesh/bmesh_class.h index c83fc0645c4..f60fc72f8a9 100644 --- a/source/blender/bmesh/bmesh_class.h +++ b/source/blender/bmesh/bmesh_class.h @@ -24,7 +24,7 @@ */ /* disable holes for now, - * these are ifdef'd because they use more memory and cant be saved in DNA currently */ + * these are ifdef'd because they use more memory and can't be saved in DNA currently */ // #define USE_BMESH_HOLES struct BMEdge; @@ -346,7 +346,7 @@ typedef struct BMesh { /* Should be copy of scene select mode. */ /* Stored in #BMEditMesh too, this is a bit confusing, * make sure they're in sync! - * Only use when the edit mesh cant be accessed - campbell */ + * Only use when the edit mesh can't be accessed - campbell */ short selectmode; /* ID of the shape key this bmesh came from */ diff --git a/source/blender/bmesh/intern/bmesh_construct.c b/source/blender/bmesh/intern/bmesh_construct.c index 3eab252df7a..f79f1925560 100644 --- a/source/blender/bmesh/intern/bmesh_construct.c +++ b/source/blender/bmesh/intern/bmesh_construct.c @@ -673,7 +673,7 @@ BMesh *BM_mesh_copy(BMesh *bm_old) ftable = MEM_mallocN(sizeof(BMFace *) * bm_old->totface, "BM_mesh_copy ftable"); BM_ITER_MESH_INDEX (v, &iter, bm_old, BM_VERTS_OF_MESH, i) { - /* copy between meshes so cant use 'example' argument */ + /* copy between meshes so can't use 'example' argument */ v_new = BM_vert_create(bm_new, v->co, NULL, BM_CREATE_SKIP_CD); BM_elem_attrs_copy_ex(bm_old, bm_new, v, v_new, 0xff, 0x0); v_new->head.hflag = v->head.hflag; /* low level! don't do this for normal api use */ diff --git a/source/blender/bmesh/intern/bmesh_inline.h b/source/blender/bmesh/intern/bmesh_inline.h index 2888d7e7526..4350b4d04ed 100644 --- a/source/blender/bmesh/intern/bmesh_inline.h +++ b/source/blender/bmesh/intern/bmesh_inline.h @@ -95,7 +95,7 @@ BLI_INLINE void _bm_elem_flag_merge_into(BMHeader *head, /** * notes on #BM_elem_index_set(...) usage, - * Set index is sometimes abused as temp storage, other times we cant be + * Set index is sometimes abused as temp storage, other times we can't be * sure if the index values are valid because certain operations have modified * the mesh structure. * diff --git a/source/blender/bmesh/intern/bmesh_mesh.c b/source/blender/bmesh/intern/bmesh_mesh.c index d0c6bc83088..80028564ff2 100644 --- a/source/blender/bmesh/intern/bmesh_mesh.c +++ b/source/blender/bmesh/intern/bmesh_mesh.c @@ -840,8 +840,8 @@ void BM_mesh_remap(BMesh *bm, const uint *vert_idx, const uint *edge_idx, const BMVert **verts_pool, *verts_copy, **vep; int i, totvert = bm->totvert; const uint *new_idx; - /* Special case: Python uses custom - data layers to hold PyObject references. - * These have to be kept in - place, else the PyObject's we point to, wont point back to us. */ + /* Special case: Python uses custom data layers to hold PyObject references. + * These have to be kept in place, else the PyObjects we point to, won't point back to us. */ const int cd_vert_pyptr = CustomData_get_offset(&bm->vdata, CD_BM_ELEM_PYPTR); /* Init the old-to-new vert pointers mapping */ @@ -892,8 +892,8 @@ void BM_mesh_remap(BMesh *bm, const uint *vert_idx, const uint *edge_idx, const BMEdge **edges_pool, *edges_copy, **edp; int i, totedge = bm->totedge; const uint *new_idx; - /* Special case: Python uses custom - data layers to hold PyObject references. - * These have to be kept in - place, else the PyObject's we point to, wont point back to us. */ + /* Special case: Python uses custom data layers to hold PyObject references. + * These have to be kept in place, else the PyObjects we point to, won't point back to us. */ const int cd_edge_pyptr = CustomData_get_offset(&bm->edata, CD_BM_ELEM_PYPTR); /* Init the old-to-new vert pointers mapping */ @@ -943,8 +943,8 @@ void BM_mesh_remap(BMesh *bm, const uint *vert_idx, const uint *edge_idx, const BMFace **faces_pool, *faces_copy, **fap; int i, totface = bm->totface; const uint *new_idx; - /* Special case: Python uses custom - data layers to hold PyObject references. - * These have to be kept in - place, else the PyObject's we point to, wont point back to us. */ + /* Special case: Python uses custom data layers to hold PyObject references. + * These have to be kept in place, else the PyObjects we point to, won't point back to us. */ const int cd_poly_pyptr = CustomData_get_offset(&bm->pdata, CD_BM_ELEM_PYPTR); /* Init the old-to-new vert pointers mapping */ diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c index 76e32667804..548dba242bf 100644 --- a/source/blender/bmesh/intern/bmesh_mods.c +++ b/source/blender/bmesh/intern/bmesh_mods.c @@ -46,7 +46,7 @@ * </pre> * * This function can also collapse edges too - * in cases when it cant merge into faces. + * in cases when it can't merge into faces. * * \par Example: * <pre> diff --git a/source/blender/bmesh/intern/bmesh_query.c b/source/blender/bmesh/intern/bmesh_query.c index 03655bccf1c..da407abfb21 100644 --- a/source/blender/bmesh/intern/bmesh_query.c +++ b/source/blender/bmesh/intern/bmesh_query.c @@ -699,7 +699,7 @@ BMEdge *BM_vert_other_disk_edge(BMVert *v, BMEdge *e_first) if (BM_edge_is_manifold(l_a->e)) { l_a = l_a->radial_next; } - /* this wont have changed from the previous loop */ + /* this won't have changed from the previous loop */ i++; } while (l_a != e_first->l); @@ -978,7 +978,7 @@ bool BM_vert_is_manifold(const BMVert *v) /* start at the boundary */ l_first = e_iter->l; boundary_num += 1; - /* >2 boundaries cant be manifold */ + /* >2 boundaries can't be manifold */ if (boundary_num == 3) { return false; } diff --git a/source/blender/bmesh/operators/bmo_bridge.c b/source/blender/bmesh/operators/bmo_bridge.c index 5713c17e146..0a6540c0e5e 100644 --- a/source/blender/bmesh/operators/bmo_bridge.c +++ b/source/blender/bmesh/operators/bmo_bridge.c @@ -236,7 +236,7 @@ static void bridge_loop_pair(BMesh *bm, if (UNLIKELY((len_squared_v3(el_dir) < eps) || ((fabsf(dot_a) < eps) && (fabsf(dot_b) < eps)))) { /* in this case there is no depth between the two loops, * eg: 2x 2d circles, one scaled smaller, - * in this case 'el_dir' cant be used, just ensure we have matching flipping. */ + * in this case 'el_dir' can't be used, just ensure we have matching flipping. */ if (dot_v3v3(BM_edgeloop_normal_get(el_store_a), BM_edgeloop_normal_get(el_store_b)) < 0.0f) { BM_edgeloop_flip(bm, el_store_b); } diff --git a/source/blender/bmesh/operators/bmo_normals.c b/source/blender/bmesh/operators/bmo_normals.c index 3311ffefb0d..b5f5e5e308b 100644 --- a/source/blender/bmesh/operators/bmo_normals.c +++ b/source/blender/bmesh/operators/bmo_normals.c @@ -138,7 +138,7 @@ static int recalc_face_normals_find_index(BMesh *bm, * then the outer-most loop attached to that vertex. * * Important this is correctly detected, - * where casting a ray from the center wont hit any loops past this one. + * where casting a ray from the center won't hit any loops past this one. * Otherwise the result may be incorrect. */ for (i = 0; i < faces_len; i++) { diff --git a/source/blender/bmesh/operators/bmo_subdivide_edgering.c b/source/blender/bmesh/operators/bmo_subdivide_edgering.c index 38a27b811b0..16d7b79a028 100644 --- a/source/blender/bmesh/operators/bmo_subdivide_edgering.c +++ b/source/blender/bmesh/operators/bmo_subdivide_edgering.c @@ -244,7 +244,7 @@ static GSet *bm_edgering_pair_calc(BMesh *bm, ListBase *eloops_rim) el_store_other = BLI_ghash_lookup(vert_eloop_gh, v_other); - /* in rare cases we cant find a match */ + /* in rare cases we can't find a match */ if (el_store_other) { pair_test.first = el_store; pair_test.second = el_store_other; diff --git a/source/blender/bmesh/tools/bmesh_bisect_plane.c b/source/blender/bmesh/tools/bmesh_bisect_plane.c index e7d0fe6a0c6..8f03b86b859 100644 --- a/source/blender/bmesh/tools/bmesh_bisect_plane.c +++ b/source/blender/bmesh/tools/bmesh_bisect_plane.c @@ -368,7 +368,7 @@ static void bm_face_bisect_verts( } } - /* Ideally wont happen, but it can for self intersecting faces. */ + /* Ideally won't happen, but it can for self-intersecting faces. */ // BLI_assert(found == true); /* In fact this simple test is good enough, test if the loops are adjacent. */ diff --git a/source/blender/bmesh/tools/bmesh_decimate_collapse.c b/source/blender/bmesh/tools/bmesh_decimate_collapse.c index bc497c38e7a..82878c7618a 100644 --- a/source/blender/bmesh/tools/bmesh_decimate_collapse.c +++ b/source/blender/bmesh/tools/bmesh_decimate_collapse.c @@ -1372,7 +1372,7 @@ void BM_mesh_decimate_collapse(BMesh *bm, /* handy to detect corruptions elsewhere */ BLI_assert(BM_elem_index_get(e) < tot_edge_orig); - /* Under normal conditions wont be accessed again, + /* Under normal conditions won't be accessed again, * but NULL just in case so we don't use freed node. */ eheap_table[BM_elem_index_get(e)] = NULL; diff --git a/source/blender/bmesh/tools/bmesh_intersect.c b/source/blender/bmesh/tools/bmesh_intersect.c index 710d7f79637..cc980a81aad 100644 --- a/source/blender/bmesh/tools/bmesh_intersect.c +++ b/source/blender/bmesh/tools/bmesh_intersect.c @@ -560,8 +560,8 @@ static void bm_isect_tri_tri( /* vert-vert * --------- */ { - /* first check in any verts are touching - * (any case where we wont create new verts) + /* first check if any verts are touching + * (any case where we won't create new verts) */ uint i_a; for (i_a = 0; i_a < 3; i_a++) { @@ -1606,7 +1606,7 @@ bool BM_mesh_intersect(BMesh *bm, for (node = s.vert_dissolve; node; node = node->next) { BMVert *v = node->link; if (BM_vert_is_edge_pair(v)) { - /* we wont create degenerate faces from this */ + /* we won't create degenerate faces from this */ bool ok = true; /* would we create a 2-sided-face? diff --git a/source/blender/bmesh/tools/bmesh_wireframe.c b/source/blender/bmesh/tools/bmesh_wireframe.c index 1c820db74f4..a3db93be033 100644 --- a/source/blender/bmesh/tools/bmesh_wireframe.c +++ b/source/blender/bmesh/tools/bmesh_wireframe.c @@ -63,7 +63,7 @@ static void bm_vert_boundary_tangent( float tvec_a[3], tvec_b[3]; /* get 2 boundary edges, there should only _be_ 2, - * in case there are more - results wont be valid of course */ + * in case there are more - results won't be valid of course */ BM_ITER_ELEM (e_iter, &iter, v, BM_EDGES_OF_VERT) { if (BM_elem_flag_test(e_iter, BM_ELEM_TAG)) { if (e_a == NULL) { diff --git a/source/blender/compositor/intern/COM_MemoryBuffer.h b/source/blender/compositor/intern/COM_MemoryBuffer.h index 97b220508e0..045dc996e3e 100644 --- a/source/blender/compositor/intern/COM_MemoryBuffer.h +++ b/source/blender/compositor/intern/COM_MemoryBuffer.h @@ -408,7 +408,7 @@ class MemoryBuffer { * \brief add the content from otherBuffer to this MemoryBuffer * \param otherBuffer: source buffer * - * \note take care when running this on a new buffer since it wont fill in + * \note take care when running this on a new buffer since it won't fill in * uninitialized values in areas where the buffers don't overlap. */ void fill_from(const MemoryBuffer &src); diff --git a/source/blender/draw/engines/overlay/overlay_armature.c b/source/blender/draw/engines/overlay/overlay_armature.c index ea636c3d185..e6c3248b6c4 100644 --- a/source/blender/draw/engines/overlay/overlay_armature.c +++ b/source/blender/draw/engines/overlay/overlay_armature.c @@ -2018,7 +2018,7 @@ static void draw_armature_pose(ArmatureDrawContext *ctx) ((draw_ctx->object_mode == OB_MODE_OBJECT) && (scene->toolsettings->object_flag & SCE_OBJECT_MODE_LOCK) == 0) || /* Allow selection when in weight-paint mode - * (selection code ensures this wont become active). */ + * (selection code ensures this won't become active). */ ((draw_ctx->object_mode & OB_MODE_ALL_WEIGHT_PAINT) && (draw_ctx->object_pose != NULL))))) && DRW_state_is_select(); diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c index 20ec22a2f78..3b70490509d 100644 --- a/source/blender/draw/intern/draw_cache_impl_mesh.c +++ b/source/blender/draw/intern/draw_cache_impl_mesh.c @@ -1299,7 +1299,7 @@ void DRW_mesh_batch_cache_create_requested(struct TaskGraph *task_graph, /* Don't check `DRW_object_is_in_edit_mode(ob)` here because it means the same mesh * may draw with edit-mesh data and regular mesh data. - * In this case the custom-data layers used wont always match in `me->runtime.batch_cache`. + * In this case the custom-data layers used won't always match in `me->runtime.batch_cache`. * If we want to display regular mesh data, we should have a separate cache for the edit-mesh. * See T77359. */ const bool is_editmode = (me->edit_mesh != NULL) && diff --git a/source/blender/editors/animation/keyframes_general.c b/source/blender/editors/animation/keyframes_general.c index 87291974e08..b2d74376102 100644 --- a/source/blender/editors/animation/keyframes_general.c +++ b/source/blender/editors/animation/keyframes_general.c @@ -913,7 +913,7 @@ static tAnimCopybufItem *pastebuf_match_path_property(Main *bmain, if (aci->rna_path && fcu->rna_path) { /* find the property of the fcurve and compare against the end of the tAnimCopybufItem * more involved since it needs to do path lookups. - * This is not 100% reliable since the user could be editing the curves on a path that wont + * This is not 100% reliable since the user could be editing the curves on a path that won't * resolve, or a bone could be renamed after copying for eg. but in normal copy & paste * this should work out ok. */ diff --git a/source/blender/editors/armature/armature_skinning.c b/source/blender/editors/armature/armature_skinning.c index f86ec545712..fc9191967f8 100644 --- a/source/blender/editors/armature/armature_skinning.c +++ b/source/blender/editors/armature/armature_skinning.c @@ -486,8 +486,8 @@ void ED_object_vgroup_calc_from_armature(ReportList *reports, defbase_add = bone_looper(ob, arm->bonebase.first, NULL, vgroup_add_unique_bone_cb); if (defbase_add) { - /* its possible there are DWeight's outside the range of the current - * objects deform groups, in this case the new groups wont be empty T33889. */ + /* It's possible there are DWeights outside the range of the current + * object's deform groups. In this case the new groups won't be empty T33889. */ ED_vgroup_data_clamp_range(ob->data, defbase_tot); } } diff --git a/source/blender/editors/gpencil/gpencil_armature.c b/source/blender/editors/gpencil/gpencil_armature.c index 3271096c433..6d6f4bc4b40 100644 --- a/source/blender/editors/gpencil/gpencil_armature.c +++ b/source/blender/editors/gpencil/gpencil_armature.c @@ -462,8 +462,8 @@ static void gpencil_object_vgroup_calc_from_armature(const bContext *C, defbase_add = gpencil_bone_looper(ob, arm->bonebase.first, NULL, vgroup_add_unique_bone_cb); if (defbase_add) { - /* its possible there are DWeight's outside the range of the current - * objects deform groups, in this case the new groups wont be empty */ + /* It's possible there are DWeights outside the range of the current + * object's deform groups. In this case the new groups won't be empty */ ED_vgroup_data_clamp_range(ob->data, defbase_tot); } diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index b72e0f30ef5..f5528638bec 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -985,12 +985,12 @@ bool UI_but_active_only(const bContext *C, ARegion *region, uiBlock *block, uiBu /** * \warning This must run after other handlers have been added, - * otherwise the handler wont be removed, see: T71112. + * otherwise the handler won't be removed, see: T71112. */ bool UI_block_active_only_flagged_buttons(const bContext *C, ARegion *region, uiBlock *block) { /* Running this command before end-block has run, means buttons that open menus - * wont have those menus correctly positioned, see T83539. */ + * won't have those menus correctly positioned, see T83539. */ BLI_assert(block->endblock); bool done = false; @@ -3223,8 +3223,8 @@ void ui_but_range_set_hard(uiBut *but) /* note: this could be split up into functions which handle arrays and not */ void ui_but_range_set_soft(uiBut *but) { - /* ideally we would not limit this but practically, its more than - * enough worst case is very long vectors wont use a smart soft-range + /* Ideally we would not limit this, but practically it's more than + * enough. Worst case is very long vectors won't use a smart soft-range, * which isn't so bad. */ if (but->rnaprop) { diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 5f98a501bec..a5b7f3820fc 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -1561,7 +1561,7 @@ static void ui_drag_toggle_set(bContext *C, uiDragToggleHandle *drag_info, const }; /* check if this is a different button, - * chances are high the button wont move about :) */ + * chances are high the button won't move about :) */ if (len_manhattan_v2v2(drag_info->but_cent_start, but_cent_new) > 1.0f) { if (fabsf(drag_info->but_cent_start[0] - but_cent_new[0]) < fabsf(drag_info->but_cent_start[1] - but_cent_new[1])) { @@ -1939,7 +1939,7 @@ static bool ui_but_drag_init(bContext *C, uiDragToggleHandle *drag_info = MEM_callocN(sizeof(*drag_info), __func__); ARegion *region_prev; - /* call here because regular mouse-up event wont run, + /* call here because regular mouse-up event won't run, * typically 'button_activate_exit()' handles this */ ui_apply_but_autokey(C, but); @@ -3414,7 +3414,7 @@ static void ui_textedit_end(bContext *C, uiBut *but, uiHandleButtonData *data) const int strip = BLI_utf8_invalid_strip(but->editstr, strlen(but->editstr)); /* not a file?, strip non utf-8 chars */ if (strip) { - /* wont happen often so isn't that annoying to keep it here for a while */ + /* won't happen often so isn't that annoying to keep it here for a while */ printf("%s: invalid utf8 - stripped chars %d\n", __func__, strip); } } @@ -9662,7 +9662,7 @@ static void ui_region_auto_open_clear(ARegion *region) * This allows a menu to be open, * but send key events to the parent if there's no active buttons. * - * Without this keyboard navigation from menu's wont work. + * Without this keyboard navigation from menus won't work. */ static bool ui_menu_pass_event_to_parent_if_nonactive(uiPopupBlockHandle *menu, const uiBut *but, diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c index 0cf3ad59903..ce5c17a0718 100644 --- a/source/blender/editors/interface/interface_ops.c +++ b/source/blender/editors/interface/interface_ops.c @@ -803,7 +803,7 @@ bool UI_context_copy_to_selected_list(bContext *C, } else if (RNA_struct_is_a(ptr->type, &RNA_Sequence)) { /* Special case when we do this for 'Sequence.lock'. - * (if the sequence is locked, it wont be in "selected_editable_sequences"). */ + * (if the sequence is locked, it won't be in "selected_editable_sequences"). */ const char *prop_id = RNA_property_identifier(prop); if (STREQ(prop_id, "lock")) { *r_lb = CTX_data_collection_get(C, "selected_sequences"); @@ -921,7 +921,7 @@ bool UI_context_copy_to_selected_list(bContext *C, * to handle situations like T41062... */ if ((*r_path = RNA_path_resolve_from_type_to_property(ptr, prop, &RNA_Sequence)) != NULL) { /* Special case when we do this for 'Sequence.lock'. - * (if the sequence is locked, it wont be in "selected_editable_sequences"). */ + * (if the sequence is locked, it won't be in "selected_editable_sequences"). */ const char *prop_id = RNA_property_identifier(prop); if (STREQ(prop_id, "lock")) { *r_lb = CTX_data_collection_get(C, "selected_sequences"); diff --git a/source/blender/editors/mask/mask_shapekey.c b/source/blender/editors/mask/mask_shapekey.c index 81bf66da72c..4ce4a416796 100644 --- a/source/blender/editors/mask/mask_shapekey.c +++ b/source/blender/editors/mask/mask_shapekey.c @@ -291,7 +291,7 @@ static int mask_shape_key_rekey_exec(bContext *C, wmOperator *op) BLI_addtail(&shapes_tmp, mask_layer_shape_tmp); } - /* re-key, note: cant modify the keys here since it messes uop */ + /* re-key, note: can't modify the keys here since it messes uop */ for (mask_layer_shape_tmp = shapes_tmp.first; mask_layer_shape_tmp; mask_layer_shape_tmp = mask_layer_shape_tmp->next) { BKE_mask_layer_evaluate(mask_layer, mask_layer_shape_tmp->frame, true); diff --git a/source/blender/editors/mesh/editmesh_bisect.c b/source/blender/editors/mesh/editmesh_bisect.c index fe627d38f46..42cf36dda81 100644 --- a/source/blender/editors/mesh/editmesh_bisect.c +++ b/source/blender/editors/mesh/editmesh_bisect.c @@ -347,7 +347,7 @@ static int mesh_bisect_exec(bContext *C, wmOperator *op) BMOperator bmop_attr; /* The fill normal sign is ignored as the face-winding is defined by surrounding faces. - * The normal is passed so triangle fill wont have to calculate it. */ + * The normal is passed so triangle fill won't have to calculate it. */ normalize_v3_v3(normal_fill, plane_no_local); /* Fill */ diff --git a/source/blender/editors/mesh/editmesh_loopcut.c b/source/blender/editors/mesh/editmesh_loopcut.c index 428bdbd637e..71319338a53 100644 --- a/source/blender/editors/mesh/editmesh_loopcut.c +++ b/source/blender/editors/mesh/editmesh_loopcut.c @@ -223,7 +223,7 @@ static void ringsel_finish(bContext *C, wmOperator *op) EDBM_selectmode_flush_ex(lcd->em, SCE_SELECT_VERTEX); } - /* we cant slide multiple edges in vertex select mode */ + /* we can't slide multiple edges in vertex select mode */ else if (is_macro && (cuts > 1) && (em->selectmode & SCE_SELECT_VERTEX)) { EDBM_selectmode_disable(lcd->vc.scene, em, SCE_SELECT_VERTEX, SCE_SELECT_EDGE); } diff --git a/source/blender/editors/mesh/editmesh_polybuild.c b/source/blender/editors/mesh/editmesh_polybuild.c index 92d97f76509..303cf41df0d 100644 --- a/source/blender/editors/mesh/editmesh_polybuild.c +++ b/source/blender/editors/mesh/editmesh_polybuild.c @@ -575,7 +575,7 @@ static int edbm_polybuild_dissolve_at_cursor_invoke(bContext *C, else { /* too involved to do inline */ - /* Avoid using selection so failure wont leave modified state. */ + /* Avoid using selection so failure won't leave modified state. */ EDBM_flag_disable_all(em, BM_ELEM_TAG); BM_elem_flag_enable(v_act, BM_ELEM_TAG); diff --git a/source/blender/editors/mesh/editmesh_rip.c b/source/blender/editors/mesh/editmesh_rip.c index 21262c95699..615590c51c6 100644 --- a/source/blender/editors/mesh/editmesh_rip.c +++ b/source/blender/editors/mesh/editmesh_rip.c @@ -170,15 +170,15 @@ static float edbm_rip_edge_side_measure( * * The method used for checking the side of selection is as follows... * - First tag all rip-able edges. - * - Build a contiguous edge list by looping over tagged edges and following each ones tagged + * - Build a contiguous edge list by looping over tagged edges and following each one's tagged * siblings in both directions. - * - The loops are not stored in an array, Instead both loops on either side of each edge has - * its index values set to count down from the last edge, this way, once we have the 'last' - * edge its very easy to walk down the connected edge loops. - * The reason for using loops like this is because when the edges are split we don't which - * face user gets the newly created edge - * (its as good as random so we cant assume new edges will be on once side). - * After splitting, its very simple to walk along boundary loops since each only has one edge + * - The loops are not stored in an array. Instead both loops on either side of each edge has + * its index values set to count down from the last edge. This way once we have the 'last' + * edge it's very easy to walk down the connected edge loops. + * The reason for using loops like this is because when the edges are split we don't know + * which face user gets the newly created edge + * (it's as good as random so we can't assume new edges will be on one side). + * After splitting, it's very simple to walk along boundary loops since each only has one edge * from a single side. * - The end loop pairs are stored in an array however to support multiple edge-selection-islands, * so you can rip multiple selections at once. @@ -189,7 +189,7 @@ static float edbm_rip_edge_side_measure( * * Limitation! * This currently works very poorly with intersecting edge islands - * (verts with more than 2 tagged edges). This is nice to but for now not essential. + * (verts with more than 2 tagged edges). This is nice to do but for now not essential. * * - campbell. */ @@ -639,7 +639,7 @@ static int edbm_rip_invoke__vert(bContext *C, const wmEvent *event, Object *obed /* should we go ahead with edge rip or do we need to do special case, split off vertex?: * split off vertex if... - * - we cant find an edge - this means we are ripping a faces vert that is connected to other + * - we can't find an edge - this means we are ripping a faces vert that is connected to other * geometry only at the vertex. * - the boundary edge total is greater than 2, * in this case edge split _can_ work but we get far nicer results if we use this special case. diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c index b21645a1a5d..c600df503d8 100644 --- a/source/blender/editors/mesh/editmesh_select.c +++ b/source/blender/editors/mesh/editmesh_select.c @@ -2571,7 +2571,7 @@ bool EDBM_selectmode_disable(Scene *scene, const short selectmode_fallback) { /* note essential, but switch out of vertex mode since the - * selected regions wont be nicely isolated after flushing */ + * selected regions won't be nicely isolated after flushing */ if (em->selectmode & selectmode_disable) { if (em->selectmode == selectmode_disable) { em->selectmode = selectmode_fallback; diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 8a13dfd1d41..c09ce126b7f 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -984,7 +984,7 @@ static int edbm_add_edge_face_exec(bContext *C, wmOperator *op) * copying face data from surrounding, may have copied hidden face flag too. * * Important that faces use flushing since 'edges.out' - * wont include hidden edges that already existed. + * won't include hidden edges that already existed. */ BMO_slot_buffer_hflag_disable( em->bm, bmop.slots_out, "faces.out", BM_FACE, BM_ELEM_HIDDEN, true); @@ -4252,7 +4252,7 @@ static int edbm_knife_cut_exec(bContext *C, wmOperator *op) const float *sco_a = screen_vert_coords[BM_elem_index_get(be->v1)]; const float *sco_b = screen_vert_coords[BM_elem_index_get(be->v2)]; - /* check for error value (vert cant be projected) */ + /* check for error value (vert can't be projected) */ if ((sco_a[0] != FLT_MAX) && (sco_b[0] != FLT_MAX)) { isect = bm_edge_seg_isect(sco_a, sco_b, mouse_path, len, mode, &isected); diff --git a/source/blender/editors/mesh/mesh_mirror.c b/source/blender/editors/mesh/mesh_mirror.c index 0f746dfd3a0..25d3eaf11d4 100644 --- a/source/blender/editors/mesh/mesh_mirror.c +++ b/source/blender/editors/mesh/mesh_mirror.c @@ -309,7 +309,7 @@ void ED_mesh_mirrtopo_init(BMEditMesh *em, last = 0; /* Get the pairs out of the sorted hashes, note, totvert+1 means we can use the previous 2, - * but you cant ever access the last 'a' index of MirrTopoPairs */ + * but you can't ever access the last 'a' index of MirrTopoPairs */ if (em) { BMVert **vtable = em->bm->vtable; for (a = 1; a <= totvert; a++) { diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c index 3370476d466..7f26d44a4ed 100644 --- a/source/blender/editors/object/object_bake_api.c +++ b/source/blender/editors/object/object_bake_api.c @@ -158,7 +158,7 @@ static int bake_modal(bContext *C, wmOperator *UNUSED(op), const wmEvent *event) /** * for exec() when there is no render job - * note: this wont check for the escape key being pressed, but doing so isn't thread-safe. + * note: this won't check for the escape key being pressed, but doing so isn't thread-safe. */ static int bake_break(void *UNUSED(rjv)) { diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index a2c3460c88b..d39570857ab 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -285,7 +285,7 @@ static void screen_render_single_layer_set( scn = (Scene *)BLI_findstring(&mainp->scenes, scene_name, offsetof(ID, name) + 2); if (scn) { - /* camera switch wont have updated */ + /* camera switch won't have updated */ scn->r.cfra = (*scene)->r.cfra; BKE_scene_camera_switch_update(scn); @@ -793,7 +793,7 @@ static int render_breakjob(void *rjv) /** * For exec() when there is no render job - * note: this wont check for the escape key being pressed, but doing so isn't thread-safe. + * note: this won't check for the escape key being pressed, but doing so isn't thread-safe. */ static int render_break(void *UNUSED(rjv)) { diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index 2814a4c9351..377cc60f9db 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -1385,7 +1385,7 @@ static void region_rect_recursive( region->flag |= RGN_FLAG_SIZE_CLAMP_Y; } - /* We need to use a test that wont have been previously clamped. */ + /* We need to use a test that won't have been previously clamped. */ rcti winrct_test = { .xmin = region->winrct.xmin, .ymin = region->winrct.ymin, @@ -2387,7 +2387,7 @@ void ED_area_newspace(bContext *C, ScrArea *area, int type, const bool skip_regi * However, add-on install for example, forces the header to the top which shouldn't * be applied back to the previous space type when closing - see: T57724 * - * Newly created windows wont have any space data, use the alignment + * Newly-created windows won't have any space data, use the alignment * the space type defaults to in this case instead * (needed for preferences to have space-type on bottom). */ diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index 26f86c8eabb..5adc1f78545 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -122,7 +122,7 @@ BLI_INLINE uchar f_to_char(const float val) * * When 3 - a brush should have ~9 buckets under it at once * ...this helps for threading while painting as well as - * avoiding initializing pixels that wont touch the brush */ + * avoiding initializing pixels that won't touch the brush */ #define PROJ_BUCKET_BRUSH_DIV 4 #define PROJ_BUCKET_RECT_MIN 4 @@ -957,7 +957,7 @@ static int line_isect_y(const float p1[2], const float p2[2], const float y_leve return ISECT_TRUE_P2; } - /** yuck, horizontal line, we cant do much here. */ + /** yuck, horizontal line, we can't do much here. */ y_diff = fabsf(p1[1] - p2[1]); if (y_diff < 0.000001f) { @@ -991,10 +991,10 @@ static int line_isect_x(const float p1[2], const float p2[2], const float x_leve return ISECT_TRUE_P2; } - /* yuck, horizontal line, we cant do much here */ + /* yuck, horizontal line, we can't do much here */ x_diff = fabsf(p1[0] - p2[0]); - /* yuck, vertical line, we cant do much here */ + /* yuck, vertical line, we can't do much here */ if (x_diff < 0.000001f) { *y_isect = (p1[0] + p2[0]) * 0.5f; return ISECT_TRUE; @@ -3152,7 +3152,7 @@ static void project_paint_face_init(const ProjPaintState *ps, } //#if 0 else if (has_x_isect) { - /* assuming the face is not a bow-tie - we know we cant intersect again on the X */ + /* assuming the face is not a bow-tie - we know we can't intersect again on the X */ break; } //#endif @@ -3239,7 +3239,7 @@ static void project_paint_face_init(const ProjPaintState *ps, uv_image_outset(ps, lt_uv_pxoffset, lt_puv, tri_index, ibuf->x, ibuf->y); } - /* ps->loopSeamUVs cant be modified when threading, now this is done we can unlock. */ + /* ps->loopSeamUVs can't be modified when threading, now this is done we can unlock. */ if (threaded) { /* Other threads could be modifying these vars */ BLI_thread_unlock(LOCK_CUSTOM1); @@ -3292,7 +3292,7 @@ static void project_paint_face_init(const ProjPaintState *ps, interp_v2_v2v2(seam_subsection[3], seam_uvs[0], seam_uvs[1], fac1); /* if the bucket_clip_edges values Z values was kept we could avoid this - * Inset needs to be added so occlusion tests wont hit adjacent faces */ + * Inset needs to be added so occlusion tests won't hit adjacent faces */ interp_v3_v3v3(edge_verts_inset_clip[0], insetCos[fidx1], insetCos[fidx2], fac1); interp_v3_v3v3(edge_verts_inset_clip[1], insetCos[fidx1], insetCos[fidx2], fac2); @@ -3648,7 +3648,7 @@ static void project_paint_delayed_face_init(ProjPaintState *ps, has_x_isect = has_isect = 1; } else if (has_x_isect) { - /* assuming the face is not a bow-tie - we know we cant intersect again on the X */ + /* assuming the face is not a bow-tie - we know we can't intersect again on the X */ break; } } @@ -5514,7 +5514,7 @@ static void do_projectpaint_thread(TaskPool *__restrict UNUSED(pool), void *ph_v if (tool == PAINT_TOOL_SMEAR) { - for (node = smearPixels; node; node = node->next) { /* this wont run for a float image */ + for (node = smearPixels; node; node = node->next) { /* this won't run for a float image */ projPixel = node->link; *projPixel->pixel.uint_pt = ((ProjPixelClone *)projPixel)->clonepx.uint; if (lock_alpha) { @@ -5534,7 +5534,7 @@ static void do_projectpaint_thread(TaskPool *__restrict UNUSED(pool), void *ph_v } else if (tool == PAINT_TOOL_SOFTEN) { - for (node = softenPixels; node; node = node->next) { /* this wont run for a float image */ + for (node = softenPixels; node; node = node->next) { /* this won't run for a float image */ projPixel = node->link; *projPixel->pixel.uint_pt = projPixel->newColor.uint; if (lock_alpha) { diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index daccc6f228a..0a5f1975361 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -725,7 +725,7 @@ typedef struct WeightPaintInfo { * length of defbase_tot */ const bool *lock_flags; /* boolean array for selected bones, - * length of defbase_tot, cant be const because of how its passed */ + * length of defbase_tot, can't be const because of how it's passed */ const bool *defbase_sel; /* same as WeightPaintData.vgroup_validmap, * only added here for convenience */ @@ -917,7 +917,7 @@ static void do_weight_paint_vertex_single( * 'resist' so you couldn't instantly zero out other weights by painting 1.0 on the active. * * However this gave a problem since applying mirror, then normalize both verts - * the resulting weight wont match on both sides. + * the resulting weight won't match on both sides. * * If this 'resisting', slower normalize is nicer, we could call * do_weight_paint_normalize_all() and only use... @@ -941,13 +941,13 @@ static void do_weight_paint_vertex_single( * - Auto normalize is enabled. * - The group you are painting onto has a L / R version. * - * We want L/R vgroups to have the same weight but this cant be if both are over 0.5, + * We want L/R vgroups to have the same weight but this can't be if both are over 0.5, * We _could_ have special check for that, but this would need its own * normalize function which holds 2 groups from changing at once. * * So! just balance out the 2 weights, it keeps them equal and everything normalized. * - * While it wont hit the desired weight immediately as the user waggles their mouse, + * While it won't hit the desired weight immediately as the user waggles their mouse, * constant painting and re-normalizing will get there. this is also just simpler logic. * - campbell */ dw_mirr->weight = dw->weight = (dw_mirr->weight + dw->weight) * 0.5f; diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c index 334e421c837..0ac03c4c307 100644 --- a/source/blender/editors/space_file/file_ops.c +++ b/source/blender/editors/space_file/file_ops.c @@ -1677,7 +1677,7 @@ void file_draw_check_ex(bContext *C, ScrArea *area) if (op->type->check(C, op)) { file_operator_to_sfile(bmain, sfile, op); - /* redraw, else the changed settings wont get updated */ + /* redraw, else the changed settings won't get updated */ ED_area_tag_redraw(area); } } diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index 0c34c0cc756..9e2bd1448b2 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -1607,7 +1607,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 than FILE_MAX :/ */ + /* we can't 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_node/node_edit.cc b/source/blender/editors/space_node/node_edit.cc index d86b069aac3..b5ef250f5a9 100644 --- a/source/blender/editors/space_node/node_edit.cc +++ b/source/blender/editors/space_node/node_edit.cc @@ -177,7 +177,7 @@ static int compo_breakjob(void *cjv) { CompoJob *cj = (CompoJob *)cjv; - /* without G.is_break 'ESC' wont quit - which annoys users */ + /* without G.is_break 'ESC' won't quit - which annoys users */ return (*(cj->stop) #ifdef USE_ESC_COMPO || G.is_break diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index 937ac6b9dcb..e17beb228de 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -2829,7 +2829,7 @@ static int sequencer_change_path_exec(bContext *C, wmOperator *op) RNA_END; } - /* Reset these else we wont see all the images. */ + /* Reset these else we won't see all the images. */ seq->anim_startofs = seq->anim_endofs = 0; /* Correct start/end frames so we don't move. diff --git a/source/blender/editors/space_view3d/view3d_camera_control.c b/source/blender/editors/space_view3d/view3d_camera_control.c index 0edd6aeb2ca..0b232d525fa 100644 --- a/source/blender/editors/space_view3d/view3d_camera_control.c +++ b/source/blender/editors/space_view3d/view3d_camera_control.c @@ -140,7 +140,7 @@ struct View3DCameraControl *ED_view3d_cameracontrol_acquire(Depsgraph *depsgraph vctrl->persp_backup = rv3d->persp; vctrl->dist_backup = rv3d->dist; - /* check for flying ortho camera - which we cant support well + /* check for flying ortho camera - which we can't support well * we _could_ also check for an ortho camera but this is easier */ if ((rv3d->persp == RV3D_CAMOB) && (rv3d->is_persp == false)) { ((Camera *)v3d->camera->data)->type = CAM_PERSP; diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index ab0683644c3..53fc7eed43b 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -509,7 +509,7 @@ static void viewops_data_create(bContext *C, negate_v3_v3(my_origin, rv3d->ofs); /* ofs is flipped */ /* Set the dist value to be the distance from this 3d point this means you'll - * always be able to zoom into it and panning wont go bad when dist was zero. */ + * always be able to zoom into it and panning won't go bad when dist was zero. */ /* remove dist value */ upvec[0] = upvec[1] = 0; @@ -895,7 +895,7 @@ static void viewrotate_apply(ViewOpsData *vod, const int event_xy[2]) copy_qt_qt(rv3d->viewquat, vod->curr.viewquat); /* check for view snap, - * note: don't apply snap to vod->viewquat so the view wont jam up */ + * note: don't apply snap to vod->viewquat so the view won't jam up */ if (vod->axis_snap) { viewrotate_apply_snap(vod); } @@ -3647,7 +3647,7 @@ static int view3d_zoom_border_exec(bContext *C, wmOperator *op) if (rv3d->is_persp) { float p_corner[3]; - /* no depths to use, we cant do anything! */ + /* no depths to use, we can't do anything! */ if (depth_close == FLT_MAX) { BKE_report(op->reports, RPT_ERROR, "Depth too large"); return OPERATOR_CANCELLED; diff --git a/source/blender/editors/space_view3d/view3d_fly.c b/source/blender/editors/space_view3d/view3d_fly.c index 2d499cf85c7..d42746c168c 100644 --- a/source/blender/editors/space_view3d/view3d_fly.c +++ b/source/blender/editors/space_view3d/view3d_fly.c @@ -772,7 +772,7 @@ static int flyApply(bContext *C, FlyInfo *fly, bool is_confirm) float moffset[2]; /* mouse offset from the views center */ float tmp_quat[4]; /* used for rotating the view */ - /* x and y margin are define the safe area where the mouses movement wont rotate the view */ + /* x and y margin defining the safe area where the mouse's movement won't rotate the view */ int xmargin, ymargin; #ifdef NDOF_FLY_DEBUG diff --git a/source/blender/editors/space_view3d/view3d_placement.c b/source/blender/editors/space_view3d/view3d_placement.c index e602521f6a2..04f382de56b 100644 --- a/source/blender/editors/space_view3d/view3d_placement.c +++ b/source/blender/editors/space_view3d/view3d_placement.c @@ -961,7 +961,7 @@ static void view3d_interactive_add_calc_plane(bContext *C, const float view_axis_dot = fabsf(dot_v3v3(rv3d->viewinv[2], r_matrix_orient[plane_axis])); if (view_axis_dot < eps_view_align) { /* In this case, just project onto the view plane as it's important the location - * is _always_ under the mouse cursor, even if it turns out that wont lie on + * is _always_ under the mouse cursor, even if it turns out that won't lie on * the original 'plane' that's been calculated for us. */ plane_normal = rv3d->viewinv[2]; } @@ -974,7 +974,7 @@ static void view3d_interactive_add_calc_plane(bContext *C, /* Even if the calculation works, it's possible the point found is behind the view, * or very far away (past the far clipping). - * In either case creating objects wont be useful. */ + * In either case creating objects won't be useful. */ if (rv3d->is_persp) { float dir[3]; sub_v3_v3v3(dir, rv3d->viewinv[3], r_co_src); diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index b2db4de8d7e..056b2507745 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -235,7 +235,7 @@ void ED_view3d_smooth_view_ex( /* grid draw as floor */ if ((RV3D_LOCK_FLAGS(rv3d) & RV3D_LOCK_ROTATION) == 0) { /* use existing if exists, means multiple calls to smooth view - * wont lose the original 'view' setting */ + * won't lose the original 'view' setting */ rv3d->view = RV3D_VIEW_USER; } @@ -244,7 +244,7 @@ void ED_view3d_smooth_view_ex( /* if this is view rotation only * we can decrease the time allowed by * the angle between quats - * this means small rotations wont lag */ + * this means small rotations won't lag */ if (sview->quat && !sview->ofs && !sview->dist) { /* scale the time allowed by the rotation */ /* 180deg == 1.0 */ diff --git a/source/blender/editors/transform/transform_convert_curve.c b/source/blender/editors/transform/transform_convert_curve.c index e57fd85470f..cc3091ae70e 100644 --- a/source/blender/editors/transform/transform_convert_curve.c +++ b/source/blender/editors/transform/transform_convert_curve.c @@ -453,7 +453,7 @@ void recalcData_curve(TransInfo *t) if (t->state == TRANS_CANCEL) { while (nu) { - /* Cant do testhandlesNurb here, it messes up the h1 and h2 flags */ + /* Can't do testhandlesNurb here, it messes up the h1 and h2 flags */ BKE_nurb_handles_calc(nu); nu = nu->next; } diff --git a/source/blender/editors/transform/transform_convert_sequencer.c b/source/blender/editors/transform/transform_convert_sequencer.c index ffba6308c35..a67d18db37b 100644 --- a/source/blender/editors/transform/transform_convert_sequencer.c +++ b/source/blender/editors/transform/transform_convert_sequencer.c @@ -696,7 +696,7 @@ void special_aftertrans_update__sequencer(bContext *UNUSED(C), TransInfo *t) return; } /* freeSeqData in transform_conversions.c does this - * keep here so the else at the end wont run... */ + * keep here so the else at the end won't run... */ SpaceSeq *sseq = (SpaceSeq *)t->area->spacedata.first; diff --git a/source/blender/editors/transform/transform_gizmo_extrude_3d.c b/source/blender/editors/transform/transform_gizmo_extrude_3d.c index ed6c3eb0255..ca4ed01c0f6 100644 --- a/source/blender/editors/transform/transform_gizmo_extrude_3d.c +++ b/source/blender/editors/transform/transform_gizmo_extrude_3d.c @@ -367,7 +367,7 @@ static void gizmo_mesh_extrude_refresh(const bContext *C, wmGizmoGroup *gzgroup) } } - /* TODO: skip calculating axis which wont be used (above). */ + /* TODO: skip calculating axis which won't be used (above). */ switch (axis_type) { case EXTRUDE_AXIS_NORMAL: for (int i = 0; i < 3; i++) { diff --git a/source/blender/editors/transform/transform_ops.c b/source/blender/editors/transform/transform_ops.c index d7bcf8dcf90..2c424d8ace3 100644 --- a/source/blender/editors/transform/transform_ops.c +++ b/source/blender/editors/transform/transform_ops.c @@ -539,7 +539,7 @@ static bool transform_poll_property(const bContext *UNUSED(C), /* Orientation/Constraints. */ { - /* Hide orientation axis if no constraints are set, since it wont be used. */ + /* Hide orientation axis if no constraints are set, since it won't be used. */ PropertyRNA *prop_con = RNA_struct_find_property(op->ptr, "orient_type"); if (!ELEM(prop_con, NULL, prop)) { if (STRPREFIX(prop_id, "constraint")) { diff --git a/source/blender/editors/undo/ed_undo.c b/source/blender/editors/undo/ed_undo.c index 7811509ab40..df4e6f893ec 100644 --- a/source/blender/editors/undo/ed_undo.c +++ b/source/blender/editors/undo/ed_undo.c @@ -492,7 +492,7 @@ bool ED_undo_is_legacy_compatible_for_property(struct bContext *C, ID *id) } /** - * Ideally we wont access the stack directly, + * Ideally we won't access the stack directly, * this is needed for modes which handle undo themselves (bypassing #ED_undo_push). * * Using global isn't great, this just avoids doing inline, @@ -693,9 +693,9 @@ int ED_undo_operator_repeat(bContext *C, wmOperator *op) } if ((WM_operator_repeat_check(C, op)) && (WM_operator_poll(C, op->type)) && - /* note, undo/redo cant run if there are jobs active, + /* note, undo/redo can't run if there are jobs active, * check for screen jobs only so jobs like material/texture/world preview - * (which copy their data), wont stop redo, see T29579], + * (which copy their data), won't stop redo, see T29579], * * note, - WM_operator_check_ui_enabled() jobs test _must_ stay in sync with this */ (WM_jobs_test(wm, scene, WM_JOB_TYPE_ANY) == 0)) { diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index 80fbfd3d28c..7b034af1438 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -632,7 +632,7 @@ static void uv_weld_align(bContext *C, eUVWeldAlign tool) } } else { - /* error - cant find an endpoint */ + /* error - can't find an endpoint */ } } diff --git a/source/blender/editors/uvedit/uvedit_rip.c b/source/blender/editors/uvedit/uvedit_rip.c index e1b9a287457..f8b53879ac4 100644 --- a/source/blender/editors/uvedit/uvedit_rip.c +++ b/source/blender/editors/uvedit/uvedit_rip.c @@ -572,7 +572,7 @@ static UVRipPairs *uv_rip_pairs_from_loop(BMLoop *l_init, rip->loops = BLI_gset_ptr_new(__func__); /* We can rely on this stack being small, as we're walking down two sides of an edge loop, - * so the stack wont be much larger than the total number of fans at any one vertex. */ + * so the stack won't be much larger than the total number of fans at any one vertex. */ BLI_SMALLSTACK_DECLARE(stack, BMLoop *); /* Needed for cases when we walk onto loops which already have a side assigned, diff --git a/source/blender/editors/uvedit/uvedit_select.c b/source/blender/editors/uvedit/uvedit_select.c index 39950f9d0c7..0a7cd579a0a 100644 --- a/source/blender/editors/uvedit/uvedit_select.c +++ b/source/blender/editors/uvedit/uvedit_select.c @@ -1296,7 +1296,7 @@ static int uv_select_edgering( l_step = uvedit_loop_find_other_radial_loop_with_visible_face( scene, l_step_opposite, cd_loop_uv_offset); if (l_step == NULL) { - /* Ensure we touch the opposite edge if we cant walk over it. */ + /* Ensure we touch the opposite edge if we can't walk over it. */ l_step = l_step_opposite; } } diff --git a/source/blender/makesdna/DNA_customdata_types.h b/source/blender/makesdna/DNA_customdata_types.h index e3b5ecfac04..e5282409329 100644 --- a/source/blender/makesdna/DNA_customdata_types.h +++ b/source/blender/makesdna/DNA_customdata_types.h @@ -72,7 +72,7 @@ typedef struct CustomData { CustomDataLayer *layers; /** * runtime only! - maps types to indices of first layer of that type, - * MUST be >= CD_NUMTYPES, but we cant use a define here. + * MUST be >= CD_NUMTYPES, but we can't use a define here. * Correct size is ensured in CustomData_update_typemap assert(). */ int typemap[51]; diff --git a/source/blender/makesdna/DNA_dynamicpaint_types.h b/source/blender/makesdna/DNA_dynamicpaint_types.h index e3dcd283efa..5f3c54a0482 100644 --- a/source/blender/makesdna/DNA_dynamicpaint_types.h +++ b/source/blender/makesdna/DNA_dynamicpaint_types.h @@ -156,7 +156,7 @@ typedef struct DynamicPaintSurface { /* canvas flags */ enum { - /** surface is already baking, so it wont get updated (loop) */ + /** surface is already baking, so it won't get updated (loop) */ MOD_DPAINT_BAKING = 1 << 1, }; diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h index 3eb5920dfe6..2b9fcaf7603 100644 --- a/source/blender/makesdna/DNA_mesh_types.h +++ b/source/blender/makesdna/DNA_mesh_types.h @@ -276,7 +276,7 @@ enum { #define ME_USING_MIRROR_X_VERTEX_GROUPS(_me) \ (((_me)->editflag & ME_EDIT_MIRROR_VERTEX_GROUPS) && ((_me)->symmetry & ME_SYMMETRY_X)) -/* We cant have both flags enabled at once, +/* We can't have both flags enabled at once, * flags defined in DNA_scene_types.h */ #define ME_EDIT_PAINT_SEL_MODE(_me) \ (((_me)->editflag & ME_EDIT_PAINT_FACE_SEL) ? \ diff --git a/source/blender/makesdna/DNA_meshdata_types.h b/source/blender/makesdna/DNA_meshdata_types.h index 05be31262a6..346e65f0fa1 100644 --- a/source/blender/makesdna/DNA_meshdata_types.h +++ b/source/blender/makesdna/DNA_meshdata_types.h @@ -130,7 +130,7 @@ typedef struct MLoop { /** * Optionally store the order of selected elements. - * This wont always be set since only some selection operations have an order. + * This won't always be set since only some selection operations have an order. * * Typically accessed from #Mesh.mselect */ diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index 41350c128ae..3b35b527584 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -101,7 +101,7 @@ typedef struct RegionView3D { /** Viewport zoom on the camera frame, see BKE_screen_view3d_zoom_to_fac. */ float camzoom; /** - * Check if persp/ortho view, since 'persp' cant be used for this since + * Check if persp/ortho view, since 'persp' can't be used for this since * it can have cameras assigned as well. (only set in #view3d_winmatrix_set) */ char is_persp; diff --git a/source/blender/makesdna/intern/dna_genfile.c b/source/blender/makesdna/intern/dna_genfile.c index a23c9087ffc..2a4bf53702f 100644 --- a/source/blender/makesdna/intern/dna_genfile.c +++ b/source/blender/makesdna/intern/dna_genfile.c @@ -855,7 +855,7 @@ static void cast_pointer_64_to_32(const int array_len, uint32_t *new_data) { /* WARNING: 32-bit Blender trying to load file saved by 64-bit Blender, - * pointers may lose uniqueness on truncation! (Hopefully this wont + * pointers may lose uniqueness on truncation! (Hopefully this won't * happen unless/until we ever get to multi-gigabyte .blend files...) */ for (int a = 0; a < array_len; a++) { new_data[a] = old_data[a] >> 3; diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index 85bcc94c335..e6b4ae97355 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -361,7 +361,7 @@ static int add_type(const char *str, int size) } if (strchr(str, '*')) { /* note: this is valid C syntax but we can't parse, complain! - * `struct SomeStruct* some_var;` <-- correct but we cant handle right now. */ + * `struct SomeStruct* some_var;` <-- correct but we can't handle right now. */ return -1; } @@ -725,7 +725,7 @@ static int convert_include(const char *filename) const int strct = add_type(md1, 0); if (strct == -1) { - fprintf(stderr, "File '%s' contains struct we cant parse \"%s\"\n", filename, md1); + fprintf(stderr, "File '%s' contains struct we can't parse \"%s\"\n", filename, md1); return 1; } diff --git a/source/blender/makesrna/RNA_types.h b/source/blender/makesrna/RNA_types.h index 8e1cfafcc42..17396a6a000 100644 --- a/source/blender/makesrna/RNA_types.h +++ b/source/blender/makesrna/RNA_types.h @@ -255,7 +255,7 @@ typedef enum PropertyFlag { * Currently only used for UI, this is similar to PROP_NEVER_NULL * except that the value may be NULL at times, used for ObData, where an Empty's will be NULL * but setting NULL on a mesh object is not possible. - * So, if its not NULL, setting NULL cant be done! + * So if it's not NULL, setting NULL can't be done! */ PROP_NEVER_UNLINK = (1 << 25), diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c index 7a9cfa79324..a75921859cb 100644 --- a/source/blender/makesrna/intern/makesrna.c +++ b/source/blender/makesrna/intern/makesrna.c @@ -4229,7 +4229,7 @@ static void rna_generate_struct(BlenderRNA *UNUSED(brna), StructRNA *srna, FILE } fprintf(f, "\t"); rna_print_c_string(f, srna->identifier); - fprintf(f, ", NULL, NULL"); /* PyType - Cant initialize here */ + fprintf(f, ", NULL, NULL"); /* PyType - Can't initialize here */ fprintf(f, ", %d, NULL, ", srna->flag); rna_print_c_string(f, srna->name); fprintf(f, ",\n\t"); diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index 948fef1b51e..edcfcd130f7 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -226,7 +226,7 @@ void RNA_pointer_recast(PointerRNA *ptr, PointerRNA *r_ptr) { StructRNA *base; PointerRNA t_ptr; - *r_ptr = *ptr; /* initialize as the same in case cant recast */ + *r_ptr = *ptr; /* initialize as the same in case can't recast */ for (base = ptr->type->base; base; base = base->base) { t_ptr = rna_pointer_inherit_refine(ptr, base, ptr->data); @@ -6869,7 +6869,7 @@ char *RNA_pointer_as_string_keywords_ex(bContext *C, if (as_function && RNA_property_type(prop) == PROP_POINTER) { /* don't expand pointers for functions */ if (flag & PROP_NEVER_NULL) { - /* we cant really do the right thing here. arg=arg?, hrmf! */ + /* we can't really do the right thing here. arg=arg?, hrmf! */ buf = BLI_strdup(arg_name); } else { @@ -8184,7 +8184,7 @@ void _RNA_warning(const char *format, ...) vprintf(format, args); va_end(args); - /* gcc macro adds '\n', but cant use for other compilers */ + /* gcc macro adds '\n', but can't use for other compilers */ #ifndef __GNUC__ fputc('\n', stdout); #endif diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c index dd7d50a80ba..2a4cd1d934a 100644 --- a/source/blender/makesrna/intern/rna_curve.c +++ b/source/blender/makesrna/intern/rna_curve.c @@ -183,7 +183,7 @@ static const EnumPropertyItem curve2d_fill_mode_items[] = { # include "ED_curve.h" /* for BKE_curve_nurbs_get */ -/* highly irritating but from RNA we cant know this */ +/* highly irritating but from RNA we can't know this */ static Nurb *curve_nurb_from_point(Curve *cu, const void *point, int *nu_index, int *pt_index) { ListBase *nurbs = BKE_curve_nurbs_get(cu); diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c index 9b9d561603b..6b0a2b324c3 100644 --- a/source/blender/makesrna/intern/rna_define.c +++ b/source/blender/makesrna/intern/rna_define.c @@ -783,7 +783,7 @@ void RNA_struct_free_extension(StructRNA *srna, ExtensionRNA *rna_ext) rna_ext->free(rna_ext->data); /* decref's the PyObject that the srna owns */ RNA_struct_blender_type_set(srna, NULL); /* this gets accessed again - XXX fixme */ - /* NULL the srna's value so RNA_struct_free wont complain of a leak */ + /* NULL the srna's value so RNA_struct_free won't complain of a leak */ RNA_struct_py_type_set(srna, NULL); #else @@ -1053,7 +1053,7 @@ StructRNA *RNA_def_struct(BlenderRNA *brna, const char *identifier, const char * if (from) { /* find struct to derive from */ - /* Inline RNA_struct_find(...) because it wont link from here. */ + /* Inline RNA_struct_find(...) because it won't link from here. */ srnafrom = BLI_ghash_lookup(brna->structs_map, from); if (!srnafrom) { CLOG_ERROR(&LOG, "struct %s not found to define %s.", from, identifier); diff --git a/source/blender/makesrna/intern/rna_fcurve.c b/source/blender/makesrna/intern/rna_fcurve.c index 1b89d866aba..399f45a2382 100644 --- a/source/blender/makesrna/intern/rna_fcurve.c +++ b/source/blender/makesrna/intern/rna_fcurve.c @@ -543,8 +543,8 @@ static void rna_FCurve_group_set(PointerRNA *ptr, return; } else if (value.data && (pid != vid)) { - /* id's differ, cant do this, should raise an error */ - printf("ERROR: ID's differ - ptr=%p vs value=%p\n", pid, vid); + /* ids differ, can't do this, should raise an error */ + printf("ERROR: IDs differ - ptr=%p vs value=%p\n", pid, vid); return; } diff --git a/source/blender/makesrna/intern/rna_image.c b/source/blender/makesrna/intern/rna_image.c index b3272f44826..c058ab6cfcc 100644 --- a/source/blender/makesrna/intern/rna_image.c +++ b/source/blender/makesrna/intern/rna_image.c @@ -1092,7 +1092,7 @@ static void rna_def_image(BlenderRNA *brna) 0, 0, "Size", - "Width and height in pixels, zero when image data cant be loaded", + "Width and height in pixels, zero when image data can't be loaded", 0, 0); RNA_def_property_subtype(prop, PROP_PIXEL); diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index 2f29a55f387..50a5a196a98 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -1072,7 +1072,7 @@ static int rna_MeshPoly_vertices_get_length(PointerRNA *ptr, int length[RNA_MAX_ { MPoly *mp = (MPoly *)ptr->data; /* note, raw access uses dummy item, this _could_ crash, - * watch out for this, mface uses it but it cant work here. */ + * watch out for this, mface uses it but it can't work here. */ return (length[0] = mp->totloop); } diff --git a/source/blender/makesrna/intern/rna_movieclip.c b/source/blender/makesrna/intern/rna_movieclip.c index f8fa2aab5e7..a32ed49ae1e 100644 --- a/source/blender/makesrna/intern/rna_movieclip.c +++ b/source/blender/makesrna/intern/rna_movieclip.c @@ -354,7 +354,7 @@ static void rna_def_movieclip(BlenderRNA *brna) 0, 0, "Size", - "Width and height in pixels, zero when image data cant be loaded", + "Width and height in pixels, zero when image data can't be loaded", 0, 0); RNA_def_property_int_funcs(prop, "rna_MovieClip_size_get", NULL, NULL); diff --git a/source/blender/makesrna/intern/rna_scene_api.c b/source/blender/makesrna/intern/rna_scene_api.c index c49b41867a8..caecd9a07d8 100644 --- a/source/blender/makesrna/intern/rna_scene_api.c +++ b/source/blender/makesrna/intern/rna_scene_api.c @@ -89,7 +89,7 @@ static void rna_Scene_frame_set(Scene *scene, Main *bmain, int frame, float subf /* don't do notifier when we're rendering, avoid some viewport crashes * redrawing while the data is being modified for render */ if (!G.is_rendering) { - /* cant use NC_SCENE|ND_FRAME because this causes wm_event_do_notifiers to call + /* can't use NC_SCENE|ND_FRAME because this causes wm_event_do_notifiers to call * BKE_scene_graph_update_for_newframe which will lose any un-keyed changes T24690. */ /* WM_main_add_notifier(NC_SCENE|ND_FRAME, scene); */ diff --git a/source/blender/makesrna/intern/rna_screen.c b/source/blender/makesrna/intern/rna_screen.c index 68bce2c00a3..25f29a3efe0 100644 --- a/source/blender/makesrna/intern/rna_screen.c +++ b/source/blender/makesrna/intern/rna_screen.c @@ -288,7 +288,7 @@ static PointerRNA rna_Region_data_get(PointerRNA *ptr) if (region->regiondata != NULL) { if (region->regiontype == RGN_TYPE_WINDOW) { - /* We could make this static, it wont change at run-time. */ + /* We could make this static, it won't change at run-time. */ SpaceType *st = BKE_spacetype_from_id(SPACE_VIEW3D); if (region->type == BKE_regiontype_from_id(st, region->regiontype)) { PointerRNA newptr; diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 036f93f43eb..f3871e625de 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -895,8 +895,8 @@ static void rna_SpaceView3D_use_local_camera_set(PointerRNA *ptr, bool value) if (!value) { Scene *scene = ED_screen_scene_find(screen, G_MAIN->wm.first); /* NULL if the screen isn't in an active window (happens when setting from Python). - * This could be moved to the update function, in that case the scene wont relate to the screen - * so keep it working this way. */ + * This could be moved to the update function, in that case the scene won't relate to the + * screen so keep it working this way. */ if (scene != NULL) { v3d->camera = scene->camera; } @@ -4966,7 +4966,7 @@ static void rna_def_space_view3d(BlenderRNA *brna) prop = RNA_def_property(srna, "view_location", PROP_FLOAT, PROP_TRANSLATION); # if 0 - RNA_def_property_float_sdna(prop, NULL, "ofs"); /* cant use because its negated */ + RNA_def_property_float_sdna(prop, NULL, "ofs"); /* can't use because it's negated */ # else RNA_def_property_array(prop, 3); RNA_def_property_float_funcs( @@ -4977,7 +4977,7 @@ static void rna_def_space_view3d(BlenderRNA *brna) RNA_def_property_update(prop, NC_WINDOW, NULL); prop = RNA_def_property( - srna, "view_rotation", PROP_FLOAT, PROP_QUATERNION); /* cant use because its inverted */ + srna, "view_rotation", PROP_FLOAT, PROP_QUATERNION); /* can't use because it's inverted */ # if 0 RNA_def_property_float_sdna(prop, NULL, "viewquat"); # else diff --git a/source/blender/makesrna/intern/rna_ui_api.c b/source/blender/makesrna/intern/rna_ui_api.c index f128719db19..f2949703c4b 100644 --- a/source/blender/makesrna/intern/rna_ui_api.c +++ b/source/blender/makesrna/intern/rna_ui_api.c @@ -1018,7 +1018,8 @@ void RNA_api_ui_layout(StructRNA *srna) func = RNA_def_function(srna, "operator_menu_enum", "rna_uiItemMenuEnumO"); RNA_def_function_flag(func, FUNC_USE_CONTEXT); - api_ui_item_op(func); /* cant use api_ui_item_op_common because property must come right after */ + api_ui_item_op( + func); /* can't use api_ui_item_op_common because property must come right after */ parm = RNA_def_string(func, "property", NULL, 0, "", "Identifier of property in operator"); RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); api_ui_item_common(func); diff --git a/source/blender/makesrna/rna_cleanup/rna_cleaner.py b/source/blender/makesrna/rna_cleanup/rna_cleaner.py index eaeca562e47..61622f281a6 100755 --- a/source/blender/makesrna/rna_cleanup/rna_cleaner.py +++ b/source/blender/makesrna/rna_cleanup/rna_cleaner.py @@ -288,7 +288,7 @@ def write_files(basename, props_list, props_length_max): f_py.write("rna_api = [\n%s]\n" % py) f_rna.write("rna_api = [\n%s]\n" % rna) - # write useful py script, wont hurt + # write useful py script, won't hurt f_py.write("\n'''\n") f_py.write("for p_note, p_changed, p_class, p_from, p_to, p_check, p_type, p_desc in rna_api:\n") f_py.write(" print(p_to)\n") diff --git a/source/blender/modifiers/intern/MOD_ui_common.c b/source/blender/modifiers/intern/MOD_ui_common.c index 0be5c164089..09fa7e9c8ac 100644 --- a/source/blender/modifiers/intern/MOD_ui_common.c +++ b/source/blender/modifiers/intern/MOD_ui_common.c @@ -346,7 +346,7 @@ static void modifier_panel_header(const bContext *C, Panel *panel) else if (ELEM(ob->type, OB_CURVE, OB_SURF, OB_FONT)) { /* Some modifiers can work with pre-tessellated curves only. */ if (ELEM(md->type, eModifierType_Hook, eModifierType_Softbody, eModifierType_MeshDeform)) { - /* Add button (appearing to be ON) and add tip why this cant be changed. */ + /* Add button (appearing to be ON) and add tip why this can't be changed. */ sub = uiLayoutRow(row, true); uiBlock *block = uiLayoutGetBlock(sub); static int apply_on_spline_always_on_hack = eModifierMode_ApplyOnSpline; diff --git a/source/blender/python/bmesh/bmesh_py_types.c b/source/blender/python/bmesh/bmesh_py_types.c index 638975f8fba..323661e7ca9 100644 --- a/source/blender/python/bmesh/bmesh_py_types.c +++ b/source/blender/python/bmesh/bmesh_py_types.c @@ -1181,7 +1181,7 @@ PyDoc_STRVAR( "\n" " Custom-data layers are only copied from ``mesh`` on initialization.\n" " Further calls will copy custom-data to matching layers, layers missing on the target " - "mesh wont be added.\n"); + "mesh won't be added.\n"); static PyObject *bpy_bmesh_from_mesh(BPy_BMesh *self, PyObject *args, PyObject *kw) { static const char *kwlist[] = {"mesh", "face_normals", "use_shape_key", "shape_key_index", NULL}; @@ -2500,7 +2500,7 @@ PyDoc_STRVAR( "\n" " Running this on sequences besides :class:`BMesh.verts`, :class:`BMesh.edges`, " ":class:`BMesh.faces`\n" - " works but wont result in each element having a valid index, instead its order in the " + " works but won't result in each element having a valid index, instead its order in the " "sequence will be set.\n"); static PyObject *bpy_bmelemseq_index_update(BPy_BMElemSeq *self) { @@ -3020,8 +3020,8 @@ static struct PyMethodDef bpy_bmfaceseq_methods[] = { static struct PyMethodDef bpy_bmloopseq_methods[] = { /* odd function, initializes index values */ - /* no: index_update() function since we cant iterate over loops */ - /* no: sort() function since we cant iterate over loops */ + /* no: index_update() function since we can't iterate over loops */ + /* no: sort() function since we can't iterate over loops */ {NULL, NULL, 0, NULL}, }; diff --git a/source/blender/python/generic/py_capi_utils.c b/source/blender/python/generic/py_capi_utils.c index 9824d5f17c4..127380feec1 100644 --- a/source/blender/python/generic/py_capi_utils.c +++ b/source/blender/python/generic/py_capi_utils.c @@ -523,7 +523,7 @@ PyObject *PyC_FrozenSetFromStrings(const char **strings) /** * Similar to #PyErr_Format(), * - * Implementation - we cant actually prepend the existing exception, + * Implementation - we can't actually prepend the existing exception, * because it could have _any_ arguments given to it, so instead we get its * ``__str__`` output and raise our own exception including it. */ @@ -846,7 +846,7 @@ PyObject *PyC_DefaultNameSpace(const char *filename) PyModule_AddStringConstant(mod_main, "__name__", "__main__"); if (filename) { /* __file__ mainly for nice UI'ness - * note: this wont map to a real file when executing text-blocks and buttons. */ + * note: this won't map to a real file when executing text-blocks and buttons. */ PyModule_AddObject(mod_main, "__file__", PyC_UnicodeFromByte(filename)); } PyModule_AddObject(mod_main, "__builtins__", builtins); diff --git a/source/blender/python/intern/bpy.c b/source/blender/python/intern/bpy.c index dc9b8b52821..30a61067c9e 100644 --- a/source/blender/python/intern/bpy.c +++ b/source/blender/python/intern/bpy.c @@ -403,7 +403,7 @@ void BPy_init_modules(struct bContext *C) Py_DECREF(py_modpath); } else { - printf("bpy: couldn't find 'scripts/modules', blender probably wont start.\n"); + printf("bpy: couldn't find 'scripts/modules', blender probably won't start.\n"); } /* stand alone utility modules not related to blender directly */ IDProp_Init_Types(); /* not actually a submodule, just types */ diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c index f95e655d0c6..8796877e9aa 100644 --- a/source/blender/python/intern/bpy_interface.c +++ b/source/blender/python/intern/bpy_interface.c @@ -154,8 +154,8 @@ void bpy_context_clear(bContext *UNUSED(C), const PyGILState_STATE *gilstate) fprintf(stderr, "ERROR: Python context internal state bug. this should not happen!\n"); } else if (py_call_level == 0) { - /* XXX - Calling classes currently wont store the context :\, - * cant set NULL because of this. but this is very flakey still. */ + /* XXX - Calling classes currently won't store the context :\, + * can't set NULL because of this. but this is very flakey still. */ #if 0 BPY_context_set(NULL); #endif @@ -825,7 +825,7 @@ static void dealloc_obj_dealloc(PyObject *self) { bpy_module_delay_init(((dealloc_obj *)self)->mod); - /* Note, for subclassed PyObjects we cant just call PyObject_DEL() directly or it will crash */ + /* Note, for subclassed PyObjects we can't just call PyObject_DEL() directly or it will crash */ dealloc_obj_Type.tp_free(self); } @@ -838,7 +838,7 @@ PyMODINIT_FUNC PyInit_bpy(void) /* Problem: * 1) this init function is expected to have a private member defined - 'md_def' * but this is only set for C defined modules (not py packages) - * so we cant return 'bpy_package_py' as is. + * so we can't return 'bpy_package_py' as is. * * 2) there is a 'bpy' C module for python to load which is basically all of blender, * and there is scripts/bpy/__init__.py, diff --git a/source/blender/python/intern/bpy_operator.c b/source/blender/python/intern/bpy_operator.c index 4a5e2552598..055dd624ea8 100644 --- a/source/blender/python/intern/bpy_operator.c +++ b/source/blender/python/intern/bpy_operator.c @@ -87,7 +87,7 @@ static PyObject *pyop_poll(PyObject *UNUSED(self), PyObject *args) bContext *C = BPY_context_get(); if (C == NULL) { - PyErr_SetString(PyExc_RuntimeError, "Context is None, cant poll any operators"); + PyErr_SetString(PyExc_RuntimeError, "Context is None, can't poll any operators"); return NULL; } @@ -174,7 +174,7 @@ static PyObject *pyop_call(PyObject *UNUSED(self), PyObject *args) bContext *C = BPY_context_get(); if (C == NULL) { - PyErr_SetString(PyExc_RuntimeError, "Context is None, cant poll any operators"); + PyErr_SetString(PyExc_RuntimeError, "Context is None, can't poll any operators"); return NULL; } @@ -367,7 +367,7 @@ static PyObject *pyop_as_string(PyObject *UNUSED(self), PyObject *args) if (C == NULL) { PyErr_SetString(PyExc_RuntimeError, - "Context is None, cant get the string representation of this object."); + "Context is None, can't get the string representation of this object."); return NULL; } diff --git a/source/blender/python/intern/bpy_props.c b/source/blender/python/intern/bpy_props.c index 6ad80f9160b..0d451a8dd7f 100644 --- a/source/blender/python/intern/bpy_props.c +++ b/source/blender/python/intern/bpy_props.c @@ -210,7 +210,7 @@ static const EnumPropertyItem property_subtype_array_items[] = { /** * Store #PyObject data for a dynamically defined property. * Currently this is only used to store call-back functions. - * Properties that don't use custom-callbacks wont allocate this struct. + * Properties that don't use custom callbacks won't allocate this struct. * * Memory/Reference Management * --------------------------- @@ -2264,7 +2264,7 @@ static void bpy_prop_callback_assign_enum(struct PropertyRNA *prop, } \ (void)0 -/* terse macros for error checks shared between all funcs cant use function +/* terse macros for error checks shared between all funcs can't use function * calls because of static strings passed to pyrna_set_to_enum_bitfield */ #define BPY_PROPDEF_CHECK(_func, _property_flag_items, _property_flag_override_items) \ if (UNLIKELY(id_len >= MAX_IDPROP_NAME)) { \ diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index fb1cb823964..89fe907e57b 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -1647,7 +1647,7 @@ int pyrna_pydict_to_props(PointerRNA *ptr, break; } - item = PyDict_GetItemString(kw, arg_name); /* Wont set an error. */ + item = PyDict_GetItemString(kw, arg_name); /* Won't set an error. */ if (item == NULL) { if (all_args) { @@ -6224,7 +6224,7 @@ static PyObject *pyrna_func_call(BPy_FunctionRNA *self, PyObject *args, PyObject err = -1; break; } - /* PyDict_GetItemString wont raise an error. */ + /* PyDict_GetItemString won't raise an error. */ continue; } @@ -7835,7 +7835,7 @@ StructRNA *pyrna_struct_as_srna(PyObject *self, const bool parent, const char *e BPy_StructRNA *py_srna = NULL; StructRNA *srna; - /* Unfortunately PyObject_GetAttrString wont look up this types tp_dict first :/ */ + /* Unfortunately PyObject_GetAttrString won't look up this types tp_dict first :/ */ if (PyType_Check(self)) { py_srna = (BPy_StructRNA *)PyDict_GetItem(((PyTypeObject *)self)->tp_dict, bpy_intern_str_bl_rna); @@ -8029,7 +8029,7 @@ static int pyrna_deferred_register_class_from_type_hints(StructRNA *srna, PyType } } else { - /* Should never happen, an error wont have been raised, so raise one. */ + /* Should never happen, an error won't have been raised, so raise one. */ PyErr_Format(PyExc_TypeError, "typing.get_type_hints returned: %.200s, expected dict\n", Py_TYPE(annotations_dict)->tp_name); @@ -8437,7 +8437,7 @@ static int bpy_class_call(bContext *C, PointerRNA *ptr, FunctionRNA *func, Param else if (py_srna == NULL) { py_class_instance = NULL; } - else if (py_srna == Py_None) { /* Probably wont ever happen, but possible. */ + else if (py_srna == Py_None) { /* Probably won't ever happen, but possible. */ Py_DECREF(py_srna); py_class_instance = NULL; } @@ -8667,7 +8667,7 @@ static int bpy_class_call(bContext *C, PointerRNA *ptr, FunctionRNA *func, Param if (err != 0) { ReportList *reports; - /* Alert the user, else they wont know unless they see the console. */ + /* Alert the user, else they won't know unless they see the console. */ if ((!is_staticmethod) && (!is_classmethod) && (ptr->data) && (RNA_struct_is_a(ptr->type, &RNA_Operator)) && (is_valid_wm == (CTX_wm_manager(C) != NULL))) { @@ -8675,7 +8675,7 @@ static int bpy_class_call(bContext *C, PointerRNA *ptr, FunctionRNA *func, Param reports = op->reports; } else { - /* Wont alert users, but they can view in 'info' space. */ + /* Won't alert users, but they can view in 'info' space. */ reports = CTX_wm_reports(C); } diff --git a/source/blender/python/mathutils/mathutils_Vector.c b/source/blender/python/mathutils/mathutils_Vector.c index 1766c7dea66..c6d801aa733 100644 --- a/source/blender/python/mathutils/mathutils_Vector.c +++ b/source/blender/python/mathutils/mathutils_Vector.c @@ -2300,7 +2300,7 @@ static int Vector_length_set(VectorObject *self, PyObject *value) dot = dot_vn_vn(self->vec, self->vec, self->size); if (!dot) { - /* cant sqrt zero */ + /* can't sqrt zero */ return 0; } diff --git a/source/blender/sequencer/intern/strip_time.c b/source/blender/sequencer/intern/strip_time.c index 65756006fa9..ecec317ed25 100644 --- a/source/blender/sequencer/intern/strip_time.c +++ b/source/blender/sequencer/intern/strip_time.c @@ -223,7 +223,7 @@ void SEQ_time_update_sequence(Scene *scene, Sequence *seq) seq->start = seq->startdisp = seq->seq1->startdisp; seq->enddisp = seq->seq1->enddisp; } - /* we cant help if strips don't overlap, it wont give useful results. + /* we can't help if strips don't overlap, it won't give useful results. * but at least ensure 'len' is never negative which causes bad bugs elsewhere. */ if (seq->enddisp < seq->startdisp) { /* simple start/end swap */ diff --git a/source/blender/sequencer/intern/strip_transform.c b/source/blender/sequencer/intern/strip_transform.c index 095d3b2fa9d..20cbe933b2f 100644 --- a/source/blender/sequencer/intern/strip_transform.c +++ b/source/blender/sequencer/intern/strip_transform.c @@ -135,7 +135,7 @@ bool SEQ_transform_seqbase_isolated_sel_check(ListBase *seqbase) /** * Use to impose limits when dragging/extending - so impossible situations don't happen. - * Cant use the #SEQ_LEFTSEL and #SEQ_LEFTSEL directly because the strip may be in a meta-strip. + * Can't use the #SEQ_LEFTSEL and #SEQ_LEFTSEL directly because the strip may be in a meta-strip. */ void SEQ_transform_handle_xlimits(Sequence *seq, int leftflag, int rightflag) { diff --git a/source/blender/windowmanager/gizmo/WM_gizmo_types.h b/source/blender/windowmanager/gizmo/WM_gizmo_types.h index fd7f9c2de7c..db18ceb0e7f 100644 --- a/source/blender/windowmanager/gizmo/WM_gizmo_types.h +++ b/source/blender/windowmanager/gizmo/WM_gizmo_types.h @@ -341,7 +341,7 @@ typedef struct wmGizmoType { const char *idname; /* MAX_NAME */ /** Set to 'sizeof(wmGizmo)' or larger for instances of this type, - * use so we can cant to other types without the hassle of a custom-data pointer. */ + * use so we can cast to other types without the hassle of a custom-data pointer. */ uint struct_size; /** Initialize struct (calloc'd 'struct_size' region). */ diff --git a/source/blender/windowmanager/intern/wm_dragdrop.c b/source/blender/windowmanager/intern/wm_dragdrop.c index fc62d0c6e06..e899cbb22b9 100644 --- a/source/blender/windowmanager/intern/wm_dragdrop.c +++ b/source/blender/windowmanager/intern/wm_dragdrop.c @@ -154,7 +154,7 @@ wmDrag *WM_event_start_drag( switch (type) { case WM_DRAG_PATH: BLI_strncpy(drag->path, poin, FILE_MAX); - /* As the path is being copied, free it immediately as `drag` wont "own" the data. */ + /* As the path is being copied, free it immediately as `drag` won't "own" the data. */ if (flags & WM_DRAG_FREE_DATA) { MEM_freeN(poin); } @@ -518,7 +518,7 @@ void wm_drags_draw(bContext *C, wmWindow *win, rcti *rect) rect->ymin = rect->ymax = cursory; } - /* Should we support multi-line drag draws? Maybe not, more types mixed wont work well. */ + /* Should we support multi-line drag draws? Maybe not, more types mixed won't work well. */ GPU_blend(GPU_BLEND_ALPHA); LISTBASE_FOREACH (wmDrag *, drag, &wm->drags) { const uchar text_col[] = {255, 255, 255, 255}; diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 0aff2c00644..93a62bb5831 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -773,7 +773,7 @@ bool WM_file_read(bContext *C, const char *filepath, ReportList *reports) wm_window_match_init(C, &wmbase); /* This flag is initialized by the operator but overwritten on read. - * need to re-enable it here else drivers + registered scripts wont work. */ + * need to re-enable it here else drivers and registered scripts won't work. */ const int G_f_orig = G.f; BKE_blendfile_read_setup(C, bfd, ¶ms, reports); @@ -1583,7 +1583,7 @@ static bool wm_file_write(bContext *C, BKE_callback_exec_null(bmain, BKE_CB_EVT_SAVE_POST); - /* run this function after because the file cant be written before the blend is */ + /* run this function after because the file can't be written before the blend is */ if (ibuf_thumb) { IMB_thumb_delete(filepath, THB_FAIL); /* without this a failed thumb overrides */ ibuf_thumb = IMB_thumb_create(filepath, THB_LARGE, THB_SOURCE_BLEND, ibuf_thumb); @@ -1778,7 +1778,7 @@ void wm_open_init_use_scripts(wmOperator *op, bool use_prefs) if (!RNA_property_is_set(op->ptr, prop)) { /* use G_FLAG_SCRIPT_AUTOEXEC rather than the userpref because this means if * the flag has been disabled from the command line, then opening - * from the menu wont enable this setting. */ + * from the menu won't enable this setting. */ bool value = use_prefs ? ((U.flag & USER_SCRIPT_AUTOEXEC_DISABLE) == 0) : ((G.f & G_FLAG_SCRIPT_AUTOEXEC) != 0); @@ -1836,7 +1836,7 @@ static int wm_homefile_write_exec(bContext *C, wmOperator *op) &(const struct BlendFileWriteParams){ /* Make all paths absolute when saving the startup file. * On load the `G.relbase_valid` will be false so the paths - * wont have a base for resolving the relative paths. */ + * won't have a base for resolving the relative paths. */ .remap_mode = BLO_WRITE_PATH_REMAP_ABSOLUTE, /* Don't apply any path changes to the current blend file. */ .use_save_as_copy = true, diff --git a/source/blender/windowmanager/intern/wm_files_link.c b/source/blender/windowmanager/intern/wm_files_link.c index e467dcd243e..c1c5eac8382 100644 --- a/source/blender/windowmanager/intern/wm_files_link.c +++ b/source/blender/windowmanager/intern/wm_files_link.c @@ -521,7 +521,7 @@ static int wm_link_append_exec(bContext *C, wmOperator *op) wm_link_append_data_free(lapp_data); - /* important we unset, otherwise these object wont + /* important we unset, otherwise these object won't * link into other scenes from this blend file */ BKE_main_id_tag_all(bmain, LIB_TAG_PRE_EXISTING, false); @@ -1008,7 +1008,7 @@ static void lib_relocate_do(Main *bmain, BKE_main_lib_objects_recalc_all(bmain); IMB_colormanagement_check_file_config(bmain); - /* important we unset, otherwise these object wont + /* important we unset, otherwise these object won't * link into other scenes from this blend file */ BKE_main_id_tag_all(bmain, LIB_TAG_PRE_EXISTING, false); diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index 15f0978f87d..48ab76317b5 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -272,7 +272,7 @@ void WM_init(bContext *C, int argc, const char **argv) * for scripts that do background processing with preview icons. */ BKE_icons_init(BIFICONID_LAST); - /* reports cant be initialized before the wm, + /* reports can't be initialized before the wm, * but keep before file reading, since that may report errors */ wm_init_reports(C); @@ -331,7 +331,7 @@ void WM_init(bContext *C, int argc, const char **argv) * startup.blend because it may contain PyDrivers. It also needs to be after * initializing space types and other internal data. * - * However cant redo this at the moment. Solution is to load python + * However can't redo this at the moment. Solution is to load python * before wm_homefile_read() or make py-drivers check if python is running. * Will try fix when the crash can be repeated. - campbell. */ diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c index 0a157e63b09..69b3660038d 100644 --- a/source/blender/windowmanager/intern/wm_keymap.c +++ b/source/blender/windowmanager/intern/wm_keymap.c @@ -1787,7 +1787,7 @@ void WM_keyconfig_update(wmWindowManager *wm) } if (wm_keymap_update_flag & WM_KEYMAP_UPDATE_OPERATORTYPE) { - /* an operatortype has been removed, this wont happen often + /* an operatortype has been removed, this won't happen often * but when it does we have to check _every_ keymap item */ ListBase *keymaps_lb[] = { &U.user_keymaps, diff --git a/source/blender/windowmanager/intern/wm_operator_type.c b/source/blender/windowmanager/intern/wm_operator_type.c index f33db7d50b5..1f3574f9032 100644 --- a/source/blender/windowmanager/intern/wm_operator_type.c +++ b/source/blender/windowmanager/intern/wm_operator_type.c @@ -343,7 +343,7 @@ static int wm_macro_exec(bContext *C, wmOperator *op) } } else { - CLOG_WARN(WM_LOG_OPERATORS, "'%s' cant exec macro", opm->type->idname); + CLOG_WARN(WM_LOG_OPERATORS, "'%s' can't exec macro", opm->type->idname); } } diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 9175eb2dbf7..32b0ca66a33 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -1346,7 +1346,7 @@ static void dialog_exec_cb(bContext *C, void *arg1, void *arg2) wmOperator *op; { /* Execute will free the operator. - * In this case, wm_operator_ui_popup_cancel wont run. */ + * In this case, wm_operator_ui_popup_cancel won't run. */ wmOpPopUp *data = arg1; op = data->op; MEM_freeN(data); diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 39bf2f1e32d..a4b32fac9fc 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -371,14 +371,14 @@ if(WITH_PYTHON) "${BLENDER_VERSION_CYCLE}" STREQUAL "rc") set(ADDON_EXCLUDE_CONDITIONAL "addons_contrib/*") else() - set(ADDON_EXCLUDE_CONDITIONAL "_addons_contrib/*") # dummy, wont do anything + set(ADDON_EXCLUDE_CONDITIONAL "_addons_contrib/*") # dummy, won't do anything endif() # do not install freestyle dir if disabled if(NOT WITH_FREESTYLE) set(FREESTYLE_EXCLUDE_CONDITIONAL "freestyle/*") else() - set(FREESTYLE_EXCLUDE_CONDITIONAL "_freestyle/*") # dummy, wont do anything + set(FREESTYLE_EXCLUDE_CONDITIONAL "_freestyle/*") # dummy, won't do anything endif() install( @@ -631,9 +631,9 @@ if(UNIX AND NOT APPLE) PATTERN "doc" EXCLUDE # ./doc PATTERN "tests" EXCLUDE # ./tests PATTERN "f2py" EXCLUDE # ./f2py - fortran/python interface code, not for blender. - PATTERN "include" EXCLUDE # include dirs all over, we wont use NumPy/CAPI + PATTERN "include" EXCLUDE # include dirs all over, we won't use NumPy/CAPI PATTERN "*.h" EXCLUDE # some includes are not in include dirs - PATTERN "*.a" EXCLUDE # ./core/lib/libnpymath.a - for linking, we dont need. + PATTERN "*.a" EXCLUDE # ./core/lib/libnpymath.a - for linking, we don't need. ) unset(_suffix) endif() diff --git a/tests/gtests/CMakeLists.txt b/tests/gtests/CMakeLists.txt index 2a89aaa4aea..6e2dd380793 100644 --- a/tests/gtests/CMakeLists.txt +++ b/tests/gtests/CMakeLists.txt @@ -1,6 +1,6 @@ if(WITH_GTESTS) - # Otherwise we get warnings here that we cant fix in external projects + # Otherwise we get warnings here that we can't fix in external projects remove_strict_flags() # Build common test executable used by most tests diff --git a/tests/python/batch_import.py b/tests/python/batch_import.py index 7e64081cfbb..134ee091bb7 100644 --- a/tests/python/batch_import.py +++ b/tests/python/batch_import.py @@ -167,7 +167,7 @@ def main(): parser.add_option("-S", "--start", dest="start", help="From collected files, start with this index", metavar='int') parser.add_option("-E", "--end", dest="end", help="From collected files, end with this index", metavar='int') - options, _args = parser.parse_args(argv) # In this example we wont use the args + options, _args = parser.parse_args(argv) # In this example we won't use the args if not argv: parser.print_help() diff --git a/tests/python/bl_run_operators.py b/tests/python/bl_run_operators.py index 26fe6dac93d..6554dd8e414 100644 --- a/tests/python/bl_run_operators.py +++ b/tests/python/bl_run_operators.py @@ -89,7 +89,7 @@ op_blacklist = ( "wm.memory_statistics", # another annoying one "wm.dependency_relations", # another annoying one "wm.keymap_restore", # another annoying one - "wm.addon_*", # harmless, but dont change state + "wm.addon_*", # harmless, but don't change state "console.*", # just annoying - but harmless "wm.url_open_preset", # Annoying but harmless (opens web pages). @@ -178,7 +178,7 @@ if USE_ATTRSET: if issubclass(cls, skip_classes): continue - # # to support skip-save we cant get all props + # # to support skip-save we can't get all props # properties = cls.bl_rna.properties.keys() properties = [] for prop_id, prop in cls.bl_rna.properties.items(): |