diff options
Diffstat (limited to 'source')
110 files changed, 176 insertions, 176 deletions
diff --git a/source/blender/avi/intern/avi.c b/source/blender/avi/intern/avi.c index 2d8a0b0038f..6e798a6244e 100644 --- a/source/blender/avi/intern/avi.c +++ b/source/blender/avi/intern/avi.c @@ -64,7 +64,7 @@ char *tcc_to_char(unsigned int tcc); -/* implemetation */ +/* implementation */ unsigned int GET_FCC(FILE *fp) { @@ -286,7 +286,7 @@ bool AVI_is_avi(const char *name) fseek(movie.fp, movie.header->size - 14 * 4, SEEK_CUR); /* Limit number of streams to some reasonable amount to prevent - * buffer oveflow vulnerabilities. */ + * buffer overflow vulnerabilities. */ if (movie.header->Streams < 1 || movie.header->Streams > 65536) { DEBUG_PRINT("Number of streams should be in range 1-65536\n"); fclose(movie.fp); @@ -489,7 +489,7 @@ AviError AVI_open_movie(const char *name, AviMovie *movie) fseek(movie->fp, movie->header->size - 14 * 4, SEEK_CUR); /* Limit number of streams to some reasonable amount to prevent - * buffer oveflow vulnerabilities. */ + * buffer overflow vulnerabilities. */ if (movie->header->Streams < 1 || movie->header->Streams > 65536) { DEBUG_PRINT("Number of streams should be in range 1-65536\n"); return AVI_ERROR_FORMAT; @@ -687,7 +687,7 @@ AviError AVI_open_movie(const char *name, AviMovie *movie) movie->read_offset = 4; } - DEBUG_PRINT("movie succesfully opened\n"); + DEBUG_PRINT("movie successfully opened\n"); return AVI_ERROR_NONE; } @@ -806,7 +806,7 @@ AviError AVI_open_compress(char *name, AviMovie *movie, int streams, ...) movie->header->Reserved[3] = 0; /* Limit number of streams to some reasonable amount to prevent - * buffer oveflow vulnerabilities. */ + * buffer overflow vulnerabilities. */ if (movie->header->Streams < 0 || movie->header->Streams > 65536) { DEBUG_PRINT("Number of streams should be in range 0-65536\n"); return AVI_ERROR_FORMAT; diff --git a/source/blender/blenkernel/BKE_action.h b/source/blender/blenkernel/BKE_action.h index 4e6fb89ba89..b627e3f69e8 100644 --- a/source/blender/blenkernel/BKE_action.h +++ b/source/blender/blenkernel/BKE_action.h @@ -70,7 +70,7 @@ void BKE_action_make_local(struct Main *bmain, struct bAction *act, const bool l /* Action API ----------------- */ /* types of transforms applied to the given item - * - these are the return falgs for action_get_item_transforms() + * - these are the return flags for action_get_item_transforms() */ typedef enum eAction_TransformFlags { /* location */ diff --git a/source/blender/blenkernel/BKE_armature.h b/source/blender/blenkernel/BKE_armature.h index d0386c8b6ca..dea5afa1ac2 100644 --- a/source/blender/blenkernel/BKE_armature.h +++ b/source/blender/blenkernel/BKE_armature.h @@ -47,7 +47,7 @@ struct ListBase; typedef struct PoseTarget { struct PoseTarget *next, *prev; - struct bConstraint *con; /* the constrait of this target */ + struct bConstraint *con; /* the constraint of this target */ int tip; /* index of tip pchan in PoseTree */ } PoseTarget; diff --git a/source/blender/blenkernel/BKE_bvhutils.h b/source/blender/blenkernel/BKE_bvhutils.h index 1b4bb08756b..c6057442fec 100644 --- a/source/blender/blenkernel/BKE_bvhutils.h +++ b/source/blender/blenkernel/BKE_bvhutils.h @@ -35,7 +35,7 @@ #include "BLI_kdopbvh.h" /** - * This header encapsulates necessary code to buld a BVH + * This header encapsulates necessary code to build a BVH */ struct DerivedMesh; diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h index 95718fa0470..e75997cd394 100644 --- a/source/blender/blenkernel/BKE_customdata.h +++ b/source/blender/blenkernel/BKE_customdata.h @@ -472,7 +472,7 @@ typedef struct CustomDataTransferLayerMap { size_t data_size; /* Size of actual data we transfer. */ size_t data_offset; /* Offset of actual data we transfer (in element contained in data_src/dst). */ - uint64_t data_flag; /* For bitflag transfer, flag(s) to affect in transfered data. */ + uint64_t data_flag; /* For bitflag transfer, flag(s) to affect in transferred data. */ void *interp_data; /* Opaque pointer, to be used by specific interp callback (e.g. transformspace for normals). */ diff --git a/source/blender/blenkernel/BKE_dynamicpaint.h b/source/blender/blenkernel/BKE_dynamicpaint.h index 937ed08a527..c265672da88 100644 --- a/source/blender/blenkernel/BKE_dynamicpaint.h +++ b/source/blender/blenkernel/BKE_dynamicpaint.h @@ -53,7 +53,7 @@ typedef struct PaintPoint { float color[4]; } PaintPoint; -/* heigh field waves */ +/* height field waves */ typedef struct PaintWavePoint { float height; diff --git a/source/blender/blenkernel/BKE_editmesh.h b/source/blender/blenkernel/BKE_editmesh.h index 92e311bb53f..2cae86d4c3b 100644 --- a/source/blender/blenkernel/BKE_editmesh.h +++ b/source/blender/blenkernel/BKE_editmesh.h @@ -27,7 +27,7 @@ * \ingroup bke * * The \link edmesh EDBM module\endlink is for editmode bmesh stuff. - * In contrast, the this module is for code shared with blenkernel thats + * In contrast, this module is for code shared with blenkernel that's * only concerned with low level operations on the #BMEditMesh structure. */ diff --git a/source/blender/blenkernel/BKE_gpencil.h b/source/blender/blenkernel/BKE_gpencil.h index 3a951b7860d..92e16f02e25 100644 --- a/source/blender/blenkernel/BKE_gpencil.h +++ b/source/blender/blenkernel/BKE_gpencil.h @@ -86,7 +86,7 @@ bool gpencil_layer_is_editable(const struct bGPDlayer *gpl); * is no existing GP-Frame on the frame requested. */ typedef enum eGP_GetFrame_Mode { - /* Use the preceeding gp-frame (i.e. don't add anything) */ + /* Use the preceding gp-frame (i.e. don't add anything) */ GP_GETFRAME_USE_PREV = 0, /* Add a new empty/blank frame */ diff --git a/source/blender/blenkernel/BKE_library_query.h b/source/blender/blenkernel/BKE_library_query.h index d6e7d98f371..65fe9abaa65 100644 --- a/source/blender/blenkernel/BKE_library_query.h +++ b/source/blender/blenkernel/BKE_library_query.h @@ -67,7 +67,7 @@ enum { enum { IDWALK_RET_NOP = 0, - IDWALK_RET_STOP_ITER = 1 << 0, /* Completly stop iteration. */ + IDWALK_RET_STOP_ITER = 1 << 0, /* Completely stop iteration. */ IDWALK_RET_STOP_RECURSION = 1 << 1, /* Stop recursion, that is, do not loop over ID used by current one. */ }; diff --git a/source/blender/blenkernel/BKE_pointcache.h b/source/blender/blenkernel/BKE_pointcache.h index 88e5a25958d..e905a5efae4 100644 --- a/source/blender/blenkernel/BKE_pointcache.h +++ b/source/blender/blenkernel/BKE_pointcache.h @@ -294,7 +294,7 @@ void BKE_ptcache_update_info(PTCacheID *pid); /* Size of cache data type. */ int BKE_ptcache_data_size(int data_type); -/* Is point with indes in memory cache */ +/* Is point with index in memory cache */ int BKE_ptcache_mem_index_find(struct PTCacheMem *pm, unsigned int index); /* Memory cache read/write helpers. */ diff --git a/source/blender/blenkernel/BKE_unit.h b/source/blender/blenkernel/BKE_unit.h index 278b303a315..82a4659eec7 100644 --- a/source/blender/blenkernel/BKE_unit.h +++ b/source/blender/blenkernel/BKE_unit.h @@ -51,7 +51,7 @@ double bUnit_BaseScalar(int system, int type); /* return true is the unit system exists */ bool bUnit_IsValid(int system, int type); -/* loop over scales, coudl add names later */ +/* loop over scales, could add names later */ //double bUnit_Iter(void **unit, char **name, int system, int type); void bUnit_GetSystem(int system, int type, void const **r_usys_pt, int *r_len); diff --git a/source/blender/blenkernel/intern/CCGSubSurf_intern.h b/source/blender/blenkernel/intern/CCGSubSurf_intern.h index 9df1c9021ef..50959d21425 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf_intern.h +++ b/source/blender/blenkernel/intern/CCGSubSurf_intern.h @@ -229,7 +229,7 @@ struct CCGSubSurf { */ bool osd_coarse_coords_invalid; - /* GL mesh descriptor, used for refinment and draw. */ + /* GL mesh descriptor, used for refinement and draw. */ struct OpenSubdiv_GLMesh *osd_mesh; /* Refiner which is used to create GL mesh. * diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 9c0fc79a358..e099ceaea53 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -561,7 +561,7 @@ void DM_update_tessface_data(DerivedMesh *dm) int *polyindex = CustomData_get_layer(fdata, CD_ORIGINDEX); unsigned int (*loopindex)[4]; - /* Should never occure, but better abort than segfault! */ + /* Should never occur, but better abort than segfault! */ if (!polyindex) return; @@ -624,7 +624,7 @@ void DM_generate_tangent_tessface_data(DerivedMesh *dm, bool generate) int *polyindex = CustomData_get_layer(fdata, CD_ORIGINDEX); unsigned int (*loopindex)[4] = NULL; - /* Should never occure, but better abort than segfault! */ + /* Should never occur, but better abort than segfault! */ if (!polyindex) return; @@ -4182,7 +4182,7 @@ void DM_init_origspace(DerivedMesh *dm) scale[1] = 1e-9f; invert_v2(scale); - /* Finally, transform all vcos_2d into ((0, 0), (1, 1)) square and assing them as origspace. */ + /* Finally, transform all vcos_2d into ((0, 0), (1, 1)) square and assign them as origspace. */ for (j = 0; j < mp->totloop; j++, lof++) { add_v2_v2v2(lof->uv, vcos_2d[j], translate); mul_v2_v2(lof->uv, scale); @@ -4210,7 +4210,7 @@ static void dm_debug_info_layers( for (type = 0; type < CD_NUMTYPES; type++) { if (CustomData_has_layer(cd, type)) { - /* note: doesnt account for multiple layers */ + /* note: doesn't account for multiple layers */ const char *name = CustomData_layertype_name(type); const int size = CustomData_sizeof(type); const void *pt = getElemDataArray(dm, type); diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c index e6848876425..00e5d17128b 100644 --- a/source/blender/blenkernel/intern/action.c +++ b/source/blender/blenkernel/intern/action.c @@ -198,7 +198,7 @@ void set_active_action_group(bAction *act, bActionGroup *agrp, short select) if (act == NULL) return; - /* Deactive all others */ + /* Deactivate all others */ for (grp = act->groups.first; grp; grp = grp->next) { if ((grp == agrp) && (select)) grp->flag |= AGRP_ACTIVE; diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c index b3c6fb4f3a9..e35af19facb 100644 --- a/source/blender/blenkernel/intern/anim.c +++ b/source/blender/blenkernel/intern/anim.c @@ -643,7 +643,7 @@ int where_on_path(Object *ob, float ctime, float vec[4], float dir[3], float qua s1 = (int)floor(ctime); fac = (float)(s1 + 1) - ctime; - /* path->len is corected for cyclic */ + /* path->len is corrected for cyclic */ s0 = interval_test(0, path->len - 1 - cycl, s1 - 1, cycl); s1 = interval_test(0, path->len - 1 - cycl, s1, cycl); s2 = interval_test(0, path->len - 1 - cycl, s1 + 1, cycl); diff --git a/source/blender/blenkernel/intern/boids.c b/source/blender/blenkernel/intern/boids.c index 18b2a5b2fcc..10f7a3b9457 100644 --- a/source/blender/blenkernel/intern/boids.c +++ b/source/blender/blenkernel/intern/boids.c @@ -1283,7 +1283,7 @@ void boid_body(BoidBrainData *bbd, ParticleData *pa) /* integrate new location & velocity */ /* by regarding the acceleration as a force at this stage we*/ - /* can get better control allthough it's a bit unphysical */ + /* can get better control although it's a bit unphysical */ mul_v3_fl(acc, 1.0f/pa_mass); copy_v3_v3(dvec, acc); diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c index 42cd7968321..50e0d158ce0 100644 --- a/source/blender/blenkernel/intern/brush.c +++ b/source/blender/blenkernel/intern/brush.c @@ -954,7 +954,7 @@ unsigned int *BKE_brush_gen_texture_cache(Brush *br, int half_side, bool use_sec texcache = MEM_callocN(sizeof(int) * side * side, "Brush texture cache"); - /* do normalized cannonical view coords for texture */ + /* do normalized canonical view coords for texture */ for (y = -1.0, iy = 0; iy < side; iy++, y += step) { for (x = -1.0, ix = 0; ix < side; ix++, x += step) { co[0] = x; @@ -962,7 +962,7 @@ unsigned int *BKE_brush_gen_texture_cache(Brush *br, int half_side, bool use_sec co[2] = 0.0f; /* This is copied from displace modifier code */ - /* TODO(sergey): brush are always cacheing with CM enabled for now. */ + /* TODO(sergey): brush are always caching with CM enabled for now. */ externtex(mtex, co, &intensity, rgba, rgba + 1, rgba + 2, rgba + 3, 0, NULL, false, false); diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c index 4597eb9b114..22fdcb9ea1f 100644 --- a/source/blender/blenkernel/intern/cloth.c +++ b/source/blender/blenkernel/intern/cloth.c @@ -1440,7 +1440,7 @@ static int cloth_build_springs ( ClothModifierData *clmd, DerivedMesh *dm ) } else { /* bending springs for hair strands */ - /* The current algorightm only goes through the edges in order of the mesh edges list */ + /* The current algorithm only goes through the edges in order of the mesh edges list */ /* and makes springs between the outer vert of edges sharing a vertice. This works just */ /* fine for hair, but not for user generated string meshes. This could/should be later */ /* extended to work with non-ordered edges so that it can be used for general "rope */ diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index 7d861658993..2f3a18cd163 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -2551,7 +2551,7 @@ static void locktrack_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *t unit_m3(totmat); } - /* apply out transformaton to the object */ + /* apply out transformation to the object */ mul_m4_m3m4(cob->matrix, totmat, cob->matrix); } } diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c index 517d2ebe10e..c9468c7d95c 100644 --- a/source/blender/blenkernel/intern/context.c +++ b/source/blender/blenkernel/intern/context.c @@ -206,7 +206,7 @@ void CTX_store_free_list(ListBase *contexts) } } -/* is python initialied? */ +/* is python initialized? */ int CTX_py_init_get(bContext *C) { diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index 792ba08358e..ea3c6c485ec 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -2077,7 +2077,7 @@ static bool bevelinside(BevList *bl1, BevList *bl2) copy_v3_v3(hvec2, hvec1); hvec2[0] += 1000; - /* test it with all edges of potential surounding poly */ + /* test it with all edges of potential surrounding poly */ /* count number of transitions left-right */ bevp = bl1->bevpoints; @@ -2640,7 +2640,7 @@ static void make_bevel_list_segment_2D(BevList *bl) static void make_bevel_list_2D(BevList *bl) { /* note: bevp->dir and bevp->quat are not needed for beveling but are - * used when making a path from a 2D curve, therefor they need to be set - Campbell */ + * used when making a path from a 2D curve, therefore they need to be set - Campbell */ BevPoint *bevp0, *bevp1, *bevp2; int nr; @@ -3938,7 +3938,7 @@ static void bezier_handle_calc_smooth_fcurve(BezTriple *bezt, int total, int sta float first_handle_adj = 0.0f, last_handle_adj = 0.0f; if (full_cycle) { - /* reduce the number of uknowns by one */ + /* reduce the number of unknowns by one */ int i = solve_count = count - 1; dx[0] = dx[i]; diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index 28280c45922..8fa117dfce1 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -2890,7 +2890,7 @@ void CustomData_bmesh_copy_data(const CustomData *source, CustomData *dest, } } -/*Bmesh Custom Data Functions. Should replace editmesh ones with these as well, due to more effecient memory alloc*/ +/*Bmesh Custom Data Functions. Should replace editmesh ones with these as well, due to more efficient memory alloc*/ void *CustomData_bmesh_get(const CustomData *data, void *block, int type) { int layer_index; diff --git a/source/blender/blenkernel/intern/data_transfer.c b/source/blender/blenkernel/intern/data_transfer.c index 38340575e74..7407fc2051f 100644 --- a/source/blender/blenkernel/intern/data_transfer.c +++ b/source/blender/blenkernel/intern/data_transfer.c @@ -833,7 +833,7 @@ static bool data_transfer_layersmapping_generate( return ret; } else if (cddata_type == CD_FAKE_SHAPEKEY) { - /* TODO: leaving shapekeys asside for now, quite specific case, since we can't access them from MVert :/ */ + /* TODO: leaving shapekeys aside for now, quite specific case, since we can't access them from MVert :/ */ return false; } } diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index ed4ee1f8b17..661c802d64e 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -778,7 +778,7 @@ static void surfaceGenerateGrid(struct DynamicPaintSurface *surface) error = 1; if (!error) { - /* calculate number of points withing each cell */ + /* calculate number of points within each cell */ { ParallelRangeSettings settings; BLI_parallel_range_settings_defaults(&settings); @@ -1988,7 +1988,7 @@ static DerivedMesh *dynamicPaint_Modifier_apply( DM_update_weight_mcol(ob, result, 0, weight, 0, NULL); } - /* apply weights into a vertex group, if doesnt exists add a new layer */ + /* apply weights into a vertex group, if doesn't exists add a new layer */ if (defgrp_index != -1 && !dvert && (surface->output_name[0] != '\0')) { dvert = CustomData_add_layer(&result->vertData, CD_MDEFORMVERT, CD_CALLOC, NULL, sData->total_points); @@ -3223,7 +3223,7 @@ void dynamicPaint_outputSurfaceImage(DynamicPaintSurface *surface, char *filenam setError(surface->canvas, N_("Image save failed: invalid surface")); return; } - /* if selected format is openexr, but current build doesnt support one */ + /* if selected format is openexr, but current build doesn't support one */ #ifndef WITH_OPENEXR if (format == R_IMF_IMTYPE_OPENEXR) format = R_IMF_IMTYPE_PNG; @@ -3516,7 +3516,7 @@ static void dynamicPaint_mixPaintColors( /* mix wetness and alpha depending on selected alpha mode */ if (paintFlags & MOD_DPAINT_ABS_ALPHA) { - /* update values to the brush level unless theyre higher already */ + /* update values to the brush level unless they're higher already */ CLAMP_MIN(pPoint->e_color[3], paintAlpha); CLAMP_MIN(pPoint->wetness, paintWetness); } @@ -5573,7 +5573,7 @@ static void dynamic_paint_wave_step_cb( } if (data->reset_wave) { - /* if there wasnt any brush intersection, clear isect height */ + /* if there wasn't any brush intersection, clear isect height */ if (wPoint->state == DPAINT_WAVE_NONE) { wPoint->brush_isect = 0.0f; } @@ -5699,7 +5699,7 @@ static void dynamic_paint_surface_pre_step_cb( /* now calculate new alpha for dry layer that keeps final blended color unchanged */ pPoint->color[3] = (f_color[3] - pPoint->e_color[3]) / (1.0f - pPoint->e_color[3]); /* for each rgb component, calculate a new dry layer color that keeps the final blend color - * with these new alpha values. (wet layer color doesnt change)*/ + * with these new alpha values. (wet layer color doesn't change)*/ if (pPoint->color[3]) { for (i = 0; i < 3; i++) { pPoint->color[i] = (f_color[i] * f_color[3] - pPoint->e_color[i] * pPoint->e_color[3]) / diff --git a/source/blender/blenkernel/intern/fmodifier.c b/source/blender/blenkernel/intern/fmodifier.c index 5911d155278..e288242ce9c 100644 --- a/source/blender/blenkernel/intern/fmodifier.c +++ b/source/blender/blenkernel/intern/fmodifier.c @@ -1284,7 +1284,7 @@ bool list_has_suitable_fmodifier(ListBase *modifiers, int mtype, short acttype) const FModifierTypeInfo *fmi = fmodifier_get_typeinfo(fcm); short mOk = 1, aOk = 1; /* by default 1, so that when only one test, won't fail */ - /* check if applicable ones are fullfilled */ + /* check if applicable ones are fulfilled */ if (mtype) mOk = (fcm->type == mtype); if (acttype > -1) diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c index ca73bbce77e..e51b10a97a4 100644 --- a/source/blender/blenkernel/intern/font.c +++ b/source/blender/blenkernel/intern/font.c @@ -605,7 +605,7 @@ void BKE_vfont_select_clamp(Object *ob) static float char_width(Curve *cu, VChar *che, CharInfo *info) { - /* The character wasn't found, propably ascii = 0, then the width shall be 0 as well */ + /* The character wasn't found, probably ascii = 0, then the width shall be 0 as well */ if (che == NULL) { return 0.0f; } diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index c520714b076..d01650e3204 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -2898,7 +2898,7 @@ static RenderPass *image_render_pass_get(RenderLayer *rl, const int pass, const } /* if layer or pass changes, we need an index for the imbufs list */ -/* note it is called for rendered results, but it doesnt use the index! */ +/* note it is called for rendered results, but it doesn't use the index! */ /* and because rendered results use fake layer/passes, don't correct for wrong indices here */ RenderPass *BKE_image_multilayer_index(RenderResult *rr, ImageUser *iuser) { @@ -2950,7 +2950,7 @@ void BKE_image_multiview_index(Image *ima, ImageUser *iuser) } /* if layer or pass changes, we need an index for the imbufs list */ -/* note it is called for rendered results, but it doesnt use the index! */ +/* note it is called for rendered results, but it doesn't use the index! */ /* and because rendered results use fake layer/passes, don't correct for wrong indices here */ bool BKE_image_is_multilayer(Image *ima) { @@ -3784,7 +3784,7 @@ static ImBuf *image_get_render_result(Image *ima, ImageUser *iuser, void **r_loc * * This is mainly to make it so color management treats byte buffer * from render result with Save Buffers enabled as final display buffer - * and doesnt' apply any color management on it. + * and doesn't apply any color management on it. * * For other cases we need to be sure it stays to default byte buffer space. */ diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c index fd8cb6d6d98..7cb9ffc3611 100644 --- a/source/blender/blenkernel/intern/ipo.c +++ b/source/blender/blenkernel/intern/ipo.c @@ -503,7 +503,7 @@ static const char *texture_adrcodes_to_paths(int adrcode, int *array_index) case TE_BRIGHT: return "brightness"; case TE_CONTRA: - return "constrast"; + return "contrast"; } return NULL; diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index 0eb943cc15b..a6cee54d81f 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -286,7 +286,7 @@ static int id_expand_local_callback( return IDWALK_RET_NOP; } - /* Can hapen that we get unlinkable ID here, e.g. with shapekey referring to itself (through drivers)... + /* Can happen that we get unlinkable ID here, e.g. with shapekey referring to itself (through drivers)... * Just skip it, shape key can only be either indirectly linked, or fully local, period. * And let's curse one more time that stupid useless shapekey ID type! */ if (*id_pointer && *id_pointer != id_self && BKE_idcode_is_linkable(GS((*id_pointer)->name))) { diff --git a/source/blender/blenkernel/intern/library_remap.c b/source/blender/blenkernel/intern/library_remap.c index 2819b0312aa..f791d9a6591 100644 --- a/source/blender/blenkernel/intern/library_remap.c +++ b/source/blender/blenkernel/intern/library_remap.c @@ -499,7 +499,7 @@ ATTR_NONNULL(1) static void libblock_remap_data( } #ifdef DEBUG_PRINT - printf("%s: %d occurences skipped (%d direct and %d indirect ones)\n", __func__, + printf("%s: %d occurrences skipped (%d direct and %d indirect ones)\n", __func__, r_id_remap_data->skipped_direct + r_id_remap_data->skipped_indirect, r_id_remap_data->skipped_direct, r_id_remap_data->skipped_indirect); #endif diff --git a/source/blender/blenkernel/intern/mask_rasterize.c b/source/blender/blenkernel/intern/mask_rasterize.c index d4508350d12..2f2b82a00eb 100644 --- a/source/blender/blenkernel/intern/mask_rasterize.c +++ b/source/blender/blenkernel/intern/mask_rasterize.c @@ -35,7 +35,7 @@ * - free the handle. * * This file is admittedly a bit confusticated, in quite few areas speed was chosen over readability, - * though it is commented - so shouldn't be so hard to see whats going on. + * though it is commented - so shouldn't be so hard to see what's going on. * * * Implementation: diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index e7450b528c8..5758e00a28d 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -152,7 +152,7 @@ static int customdata_compare(CustomData *c1, CustomData *c2, Mesh *m1, Mesh *m2 for (j = 0; j < vtot; j++, v1++, v2++) { if (len_squared_v3v3(v1->co, v2->co) > thresh_sq) return MESHCMP_VERTCOMISMATCH; - /* I don't care about normals, let's just do coodinates */ + /* I don't care about normals, let's just do coordinates */ } } diff --git a/source/blender/blenkernel/intern/mesh_convert.c b/source/blender/blenkernel/intern/mesh_convert.c index 3f870986a0b..bfee7f3924c 100644 --- a/source/blender/blenkernel/intern/mesh_convert.c +++ b/source/blender/blenkernel/intern/mesh_convert.c @@ -145,7 +145,7 @@ static void make_edges_mdata_extend( totedge_new = BLI_edgehash_len(eh); #ifdef DEBUG - /* ensure that theres no overlap! */ + /* ensure that there's no overlap! */ if (totedge_new) { MEdge *medge = *r_alledge; for (i = 0; i < totedge; i++, medge++) { diff --git a/source/blender/blenkernel/intern/mesh_evaluate.c b/source/blender/blenkernel/intern/mesh_evaluate.c index 92619b27ca0..e3b1f20e583 100644 --- a/source/blender/blenkernel/intern/mesh_evaluate.c +++ b/source/blender/blenkernel/intern/mesh_evaluate.c @@ -2424,7 +2424,7 @@ bool BKE_mesh_center_of_volume(const Mesh *me, float r_cent[3]) } /* otherwise we get NAN for 0 polys */ if (total_volume != 0.0f) { - /* multipy by 0.25 to get the correct centroid */ + /* multiply by 0.25 to get the correct centroid */ /* no need to divide volume by 6 as the centroid is weighted by 6x the volume, so it all cancels out */ mul_v3_fl(r_cent, 0.25f / total_volume); } diff --git a/source/blender/blenkernel/intern/mesh_mapping.c b/source/blender/blenkernel/intern/mesh_mapping.c index 5c9849f6b74..2d82a5102b0 100644 --- a/source/blender/blenkernel/intern/mesh_mapping.c +++ b/source/blender/blenkernel/intern/mesh_mapping.c @@ -1109,7 +1109,7 @@ bool BKE_mesh_calc_islands_loop_poly_edgeseam( * * \note If no MLoopUV layer is passed, we only consider edges tagged as seams as UV boundaries. * This has the advantages of simplicity, and being valid/common to all UV maps. - * However, it means actual UV islands whithout matching UV seams will not be handled correctly... + * However, it means actual UV islands without matching UV seams will not be handled correctly... * If a valid UV layer is passed as \a luvs parameter, UV coordinates are also used to detect islands boundaries. * * \note All this could be optimized... diff --git a/source/blender/blenkernel/intern/mesh_remap.c b/source/blender/blenkernel/intern/mesh_remap.c index e9d859cbd4e..62c81bf8cba 100644 --- a/source/blender/blenkernel/intern/mesh_remap.c +++ b/source/blender/blenkernel/intern/mesh_remap.c @@ -281,7 +281,7 @@ void BKE_mesh_remap_find_best_match_from_dm( best_match = match; copy_m4_m4(best_mat_dst, mat_dst); - /* And now, we have to check the otehr sixth possible mirrored versions... */ + /* And now, we have to check the other sixth possible mirrored versions... */ for (mirr = mirrors; (*mirr)[0]; mirr++) { mul_v3_fl(mat_dst[0], (*mirr)[0]); mul_v3_fl(mat_dst[1], (*mirr)[1]); diff --git a/source/blender/blenkernel/intern/mesh_validate.c b/source/blender/blenkernel/intern/mesh_validate.c index bedba57cf85..82b3edb5b49 100644 --- a/source/blender/blenkernel/intern/mesh_validate.c +++ b/source/blender/blenkernel/intern/mesh_validate.c @@ -362,7 +362,7 @@ bool BKE_mesh_validate_arrays( SortFace *sf_prev; unsigned int totsortface = 0; - PRINT_ERR("No Polys, only tesselated Faces\n"); + PRINT_ERR("No Polys, only tessellated Faces\n"); for (i = 0, mf = mfaces, sf = sort_faces; i < totface; i++, mf++) { bool remove = false; diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index 9fc3fc4ba64..723b4a5aa97 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -287,7 +287,7 @@ void modifier_copyData_generic(const ModifierData *md_src, ModifierData *md_dst) { const ModifierTypeInfo *mti = modifierType_getInfo(md_src->type); - /* md_dst may have alredy be fully initialized with some extra allocated data, + /* md_dst may have already be fully initialized with some extra allocated data, * we need to free it now to avoid memleak. */ if (mti->freeData) { mti->freeData(md_dst); @@ -754,7 +754,7 @@ void test_object_modifiers(Object *ob) } } -/* where should this go?, it doesnt fit well anywhere :S - campbell */ +/* where should this go?, it doesn't fit well anywhere :S - campbell */ /* elubie: changed this to default to the same dir as the render output * to prevent saving to C:\ on Windows */ diff --git a/source/blender/blenkernel/intern/nla.c b/source/blender/blenkernel/intern/nla.c index f91d88a8a4a..75dd0416e52 100644 --- a/source/blender/blenkernel/intern/nla.c +++ b/source/blender/blenkernel/intern/nla.c @@ -1008,7 +1008,7 @@ void BKE_nlatrack_set_active(ListBase *tracks, NlaTrack *nlt_a) if (ELEM(NULL, tracks, tracks->first)) return; - /* deactive all the rest */ + /* deactivate all the rest */ for (nlt = tracks->first; nlt; nlt = nlt->next) nlt->flag &= ~NLATRACK_ACTIVE; @@ -1180,7 +1180,7 @@ static void nlastrip_fix_resize_overlaps(NlaStrip *strip) float offset = 0.0f; if (nls->type == NLASTRIP_TYPE_TRANSITION) { - /* transition strips should grow/shrink to accomodate the resized strip, + /* transition strips should grow/shrink to accommodate the resized strip, * but if the strip's bounds now exceed the transition, we're forced to * offset everything to maintain the balance */ @@ -1227,7 +1227,7 @@ static void nlastrip_fix_resize_overlaps(NlaStrip *strip) float offset = 0.0f; if (nls->type == NLASTRIP_TYPE_TRANSITION) { - /* transition strips should grow/shrink to accomodate the resized strip, + /* transition strips should grow/shrink to accommodate the resized strip, * but if the strip's bounds now exceed the transition, we're forced to * offset everything to maintain the balance */ @@ -1297,7 +1297,7 @@ void BKE_nlastrip_recalculate_bounds(NlaStrip *strip) } /* Is the given NLA-strip the first one to occur for the given AnimData block */ -// TODO: make this an api method if necesary, but need to add prefix first +// TODO: make this an api method if necessary, but need to add prefix first static bool nlastrip_is_first(AnimData *adt, NlaStrip *strip) { NlaTrack *nlt; @@ -1809,7 +1809,7 @@ void BKE_nla_action_pushdown(AnimData *adt) * NOTE: An alternative way would have been to instead hack the influence * to not get always get reset to full strength if NLASTRIP_FLAG_USR_INFLUENCE * is disabled but auto-blending isn't being used. However, that approach - * is a bit hacky/hard to discover, and may cause backwards compatability issues, + * is a bit hacky/hard to discover, and may cause backwards compatibility issues, * so it's better to just do it this way. */ strip->flag |= NLASTRIP_FLAG_USR_INFLUENCE; diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index c830917a547..b3f210dfba5 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -2067,7 +2067,7 @@ bNodeTree *ntreeLocalize(bNodeTree *ntree) /* sync local composite with real tree */ /* local tree is supposed to be running, be careful moving previews! */ -/* is called by jobs manager, outside threads, so it doesnt happen during draw */ +/* is called by jobs manager, outside threads, so it doesn't happen during draw */ void ntreeLocalSync(bNodeTree *localtree, bNodeTree *ntree) { if (localtree && ntree) { diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 1406991520b..add7c1fd992 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1785,7 +1785,7 @@ static void ob_parbone(Object *ob, Object *par, float mat[4][4]) /* get bone transform */ if (pchan->bone->flag & BONE_RELATIVE_PARENTING) { - /* the new option uses the root - expected bahaviour, but differs from old... */ + /* the new option uses the root - expected behaviour, but differs from old... */ /* XXX check on version patching? */ copy_m4_m4(mat, pchan->chan_mat); } @@ -3089,7 +3089,7 @@ int BKE_object_is_modified(Scene *scene, Object *ob) * This makes it possible to give some degree of false-positives here, * but it's currently an acceptable tradeoff between complexity and check * speed. In combination with checks of modifier stack and real life usage - * percentage of false-positives shouldn't be that hight. + * percentage of false-positives shouldn't be that height. */ static bool object_moves_in_time(Object *object) { diff --git a/source/blender/blenkernel/intern/object_dupli.c b/source/blender/blenkernel/intern/object_dupli.c index a7445d0e920..a3fb9981880 100644 --- a/source/blender/blenkernel/intern/object_dupli.c +++ b/source/blender/blenkernel/intern/object_dupli.c @@ -254,7 +254,7 @@ static void make_child_duplis(const DupliContext *ctx, void *userdata, MakeChild /* mballs have a different dupli handling */ if (ob->type != OB_MBALL) - ob->flag |= OB_DONE; /* doesnt render */ + ob->flag |= OB_DONE; /* doesn't render */ make_child_duplis_cb(&pctx, userdata, ob); } diff --git a/source/blender/blenkernel/intern/packedFile.c b/source/blender/blenkernel/intern/packedFile.c index da455faaa86..0637fc4f00c 100644 --- a/source/blender/blenkernel/intern/packedFile.c +++ b/source/blender/blenkernel/intern/packedFile.c @@ -268,7 +268,7 @@ void packAll(Main *bmain, ReportList *reports, bool verbose) #if 0 // attempt to create a function that generates an unique filename -// this will work when all funtions in fileops.c understand relative filenames... +// this will work when all functions in fileops.c understand relative filenames... static char *find_new_name(char *name) { @@ -362,7 +362,7 @@ int writePackedFile( * * - PF_EQUAL: the packed file and original file are identical * - PF_DIFFERENT: the packed file and original file differ - * - PF_NOFILE: the original file doens't exist + * - PF_NOFILE: the original file doesn't exist */ int checkPackedFile(const char *ref_file_name, const char *filename, PackedFile *pf) { diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 6ae324df136..8def945ca7c 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -1610,7 +1610,7 @@ static void sph_density_accum_cb(void *userdata, int index, const float co[3], f /* Ugh! One particle has too many neighbors! If some aren't taken into * account, the forces will be biased by the tree search order. This - * effectively adds enery to the system, and results in a churning motion. + * effectively adds energy to the system, and results in a churning motion. * But, we have to stop somewhere, and it's not the end of the world. * - jahka and z0r */ @@ -4335,7 +4335,7 @@ void particle_system_update(Main *bmain, Scene *scene, Object *ob, ParticleSyste pa->flag &= ~PARS_NO_DISP; } - /* free unexisting after reseting particles */ + /* free unexisting after resetting particles */ if (free_unexisting) free_unexisting_particles(&sim); diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index 7311b17134d..f611e7a94cd 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -137,7 +137,7 @@ static int ptcache_extra_datasize[] = { sizeof(ParticleSpring) }; -/* forward declerations */ +/* forward declarations */ static int ptcache_file_compressed_read(PTCacheFile *pf, unsigned char *result, unsigned int len); static int ptcache_file_compressed_write(PTCacheFile *pf, unsigned char *in, unsigned int in_len, unsigned char *out, int mode); static int ptcache_file_write(PTCacheFile *pf, const void *f, unsigned int tot, unsigned int size); diff --git a/source/blender/blenkernel/intern/report.c b/source/blender/blenkernel/intern/report.c index a9b36a85602..9204bc69ee9 100644 --- a/source/blender/blenkernel/intern/report.c +++ b/source/blender/blenkernel/intern/report.c @@ -140,7 +140,7 @@ void BKE_reportf(ReportList *reports, ReportType type, const char *_format, ...) va_start(args, _format); vprintf(format, args); va_end(args); - fprintf(stdout, "\n"); /* otherise each report needs to include a \n */ + fprintf(stdout, "\n"); /* otherwise each report needs to include a \n */ fflush(stdout); /* this ensures the message is printed before a crash */ } diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c index 1a0e3958dc0..08952113fce 100644 --- a/source/blender/blenkernel/intern/seqeffects.c +++ b/source/blender/blenkernel/intern/seqeffects.c @@ -2175,7 +2175,7 @@ static ImBuf *do_transform_effect( static void RVBlurBitmap2_float(float *map, int width, int height, float blur, int quality) /* MUUUCCH better than the previous blur. */ /* We do the blurring in two passes which is a whole lot faster. */ -/* I changed the math arount to implement an actual Gaussian */ +/* I changed the math around to implement an actual Gaussian */ /* distribution. */ /* */ /* Watch out though, it tends to misbehaven with large blur values on */ @@ -3021,7 +3021,7 @@ static void do_gaussian_blur_effect_byte_x( const int size_x = (int) (data->size_x + 0.5f); int i, j; - /* Make gaussian weight tabke. */ + /* Make gaussian weight table. */ float *gausstab_x; gausstab_x = make_gaussian_blur_kernel(data->size_x, size_x); @@ -3074,7 +3074,7 @@ static void do_gaussian_blur_effect_byte_y( const int size_y = (int) (data->size_y + 0.5f); int i, j; - /* Make gaussian weight tabke. */ + /* Make gaussian weight table. */ float *gausstab_y; gausstab_y = make_gaussian_blur_kernel(data->size_y, size_y); @@ -3127,7 +3127,7 @@ static void do_gaussian_blur_effect_float_x( const int size_x = (int) (data->size_x + 0.5f); int i, j; - /* Make gaussian weight tabke. */ + /* Make gaussian weight table. */ float *gausstab_x; gausstab_x = make_gaussian_blur_kernel(data->size_x, size_x); @@ -3171,7 +3171,7 @@ static void do_gaussian_blur_effect_float_y( const int size_y = (int) (data->size_y + 0.5f); int i, j; - /* Make gaussian weight tabke. */ + /* Make gaussian weight table. */ float *gausstab_y; gausstab_y = make_gaussian_blur_kernel(data->size_y, size_y); diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 0768fba3e0b..c2a96d4f1ff 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -413,7 +413,7 @@ void BKE_sequence_clipboard_pointers_restore(Sequence *seq, Main *bmain) seqclipboard_ptr_restore(bmain, (ID **)&seq->sound); } -/* recursive versions of funcions above */ +/* recursive versions of functions above */ void BKE_sequencer_base_clipboard_pointers_free(ListBase *seqbase) { Sequence *seq; @@ -1060,7 +1060,7 @@ void BKE_sequencer_sort(Scene *scene) *(ed->seqbasep) = seqbase; } -/** Comparision function suitable to be used with BLI_listbase_sort()... */ +/** Comparison function suitable to be used with BLI_listbase_sort()... */ int BKE_sequencer_cmp_time_startdisp(const void *a, const void *b) { const Sequence *seq_a = a; @@ -4507,7 +4507,7 @@ Sequence *BKE_sequencer_foreground_frame_get(Scene *scene, int frame) return best_seq; } -/* return 0 if there werent enough space */ +/* return 0 if there weren't enough space */ bool BKE_sequence_base_shuffle_ex(ListBase *seqbasep, Sequence *test, Scene *evil_scene, int channel_delta) { const int orig_machine = test->machine; diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c index e28b4ccc23d..13a82490895 100644 --- a/source/blender/blenkernel/intern/shrinkwrap.c +++ b/source/blender/blenkernel/intern/shrinkwrap.c @@ -384,7 +384,7 @@ static void shrinkwrap_calc_normal_projection(ShrinkwrapCalcData *calc, bool for SpaceTransform local2aux; /* If the user doesn't allows to project in any direction of projection axis - * then theres nothing todo. */ + * then there's nothing todo. */ if ((calc->smd->shrinkOpts & (MOD_SHRINKWRAP_PROJECT_ALLOW_POS_DIR | MOD_SHRINKWRAP_PROJECT_ALLOW_NEG_DIR)) == 0) return; diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index 12bc40e62a0..150e8a129fe 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -1508,7 +1508,7 @@ static void sample_derivedmesh( interp_v3_v3v3v3(hit_normal, n1, n2, n3, weights); normalize_v3(hit_normal); /* apply normal directional and random velocity - * - TODO: random disabled for now since it doesnt really work well as pressure calc smoothens it out... */ + * - TODO: random disabled for now since it doesn't really work well as pressure calc smoothens it out... */ velocity_map[index * 3] += hit_normal[0] * sfs->vel_normal * 0.25f; velocity_map[index * 3 + 1] += hit_normal[1] * sfs->vel_normal * 0.25f; velocity_map[index * 3 + 2] += hit_normal[2] * sfs->vel_normal * 0.25f; @@ -2140,7 +2140,7 @@ static void update_flowsfluids( VECSUB(new_shift, total_shift, sds->shift); copy_v3_v3_int(sds->shift, total_shift); - /* calculate new domain boundary points so that smoke doesnt slide on sub-cell movement */ + /* calculate new domain boundary points so that smoke doesn't slide on sub-cell movement */ sds->p0[0] = sds->dp0[0] - sds->cell_size[0] * (sds->shift_f[0] - total_shift[0] - 0.5f); sds->p0[1] = sds->dp0[1] - sds->cell_size[1] * (sds->shift_f[1] - total_shift[1] - 0.5f); sds->p0[2] = sds->dp0[2] - sds->cell_size[2] * (sds->shift_f[2] - total_shift[2] - 0.5f); diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index 93039bdace6..a2f2819d132 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -110,7 +110,7 @@ typedef struct ReferenceVert { typedef struct ReferenceState { float com[3]; /* center of mass*/ - ReferenceVert *ivert; /* list of intial values */ + ReferenceVert *ivert; /* list of initial values */ } ReferenceState; @@ -211,7 +211,7 @@ static float sb_time_scale(Object *ob) * will cause unwanted responses of the softbody system (which does inter frame calculations ) * so first 'cure' would be: interpolate linear in time .. * Q: why do i write this? - * A: because it happend once, that some eger coder 'streamlined' code to fail. + * A: because it happened once, that some eger coder 'streamlined' code to fail. * We DO linear interpolation for goals .. and i think we should do on animated properties as well */ @@ -952,7 +952,7 @@ static void free_softbody_intern(SoftBody *sb) * * it actually checks if the particle intrudes a short range force field generated * by the faces of the target object and returns a force to drive the particel out - * the strenght of the field grows exponetially if the particle is on the 'wrong' side of the face + * the strength of the field grows exponetially if the particle is on the 'wrong' side of the face * 'wrong' side : projection to the face normal is negative (all referred to a vertex in the face) * * flaw of this: 'fast' particles as well as 'fast' colliding faces @@ -1977,7 +1977,7 @@ static int _softbody_calc_forces_slice_in_a_thread(Scene *scene, Object *ob, flo SoftBody *sb= ob->soft; /* is supposed to be there */ BodyPoint *bp; - /* intitialize */ + /* initialize */ if (sb) { /* check conditions for various options */ /* +++ could be done on object level to squeeze out the last bits of it */ @@ -2019,7 +2019,7 @@ static int _softbody_calc_forces_slice_in_a_thread(Scene *scene, Object *ob, flo for (c=sb->totpoint, obp= sb->bpoint; c>0; c--, obp++) { compare = (obp->colball + bp->colball); sub_v3_v3v3(def, bp->pos, obp->pos); - /* rather check the AABBoxes before ever calulating the real distance */ + /* rather check the AABBoxes before ever calculating the real distance */ /* mathematically it is completely nuts, but performance is pretty much (3) times faster */ if ((ABS(def[0]) > compare) || (ABS(def[1]) > compare) || (ABS(def[2]) > compare)) continue; distance = normalize_v3(def); @@ -2061,7 +2061,7 @@ static int _softbody_calc_forces_slice_in_a_thread(Scene *scene, Object *ob, flo bp->force[1]+= -ks*(auxvect[1]); bp->force[2]+= -ks*(auxvect[2]); - /* calulate damping forces generated by goals*/ + /* calculate damping forces generated by goals*/ sub_v3_v3v3(velgoal, bp->origS, bp->origE); kd = sb->goalfrict * sb_fric_force_scale(ob); add_v3_v3v3(auxvect, velgoal, bp->vec); @@ -2348,7 +2348,7 @@ static void softbody_calc_forces(Scene *scene, Object *ob, float forcetime, floa compare = (obp->colball + bp->colball); sub_v3_v3v3(def, bp->pos, obp->pos); - /* rather check the AABBoxes before ever calulating the real distance */ + /* rather check the AABBoxes before ever calculating the real distance */ /* mathematically it is completely nuts, but performance is pretty much (3) times faster */ if ((ABS(def[0]) > compare) || (ABS(def[1]) > compare) || (ABS(def[2]) > compare)) continue; @@ -2397,7 +2397,7 @@ static void softbody_calc_forces(Scene *scene, Object *ob, float forcetime, floa bp->force[1]+= -ks*(auxvect[1]); bp->force[2]+= -ks*(auxvect[2]); - /* calulate damping forces generated by goals*/ + /* calculate damping forces generated by goals*/ sub_v3_v3v3(velgoal, bp->origS, bp->origE); kd = sb->goalfrict * sb_fric_force_scale(ob); add_v3_v3v3(auxvect, velgoal, bp->vec); @@ -2827,7 +2827,7 @@ static void springs_from_mesh(Object *ob) sb= ob->soft; if (me && sb) { - /* using bp->origS as a container for spring calcualtions here + /* using bp->origS as a container for spring calculations here * will be overwritten sbObjectStep() to receive * actual modifier stack positions */ @@ -3402,7 +3402,7 @@ static void softbody_update_positions(Object *ob, SoftBody *sb, float (*vertexCo * that is: * a precise position vector denoting the motion of the center of mass * give a rotation/scale matrix using averaging method, that's why estimate and not calculate - * see: this is kind of reverse engineering: having to states of a point cloud and recover what happend + * see: this is kind of reverse engineering: having to states of a point cloud and recover what happened * our advantage here we know the identity of the vertex * there are others methods giving other results. * lloc, lrot, lscale are allowed to be NULL, just in case you don't need it. diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index 21c90f318ec..3c4e1f92344 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -89,7 +89,7 @@ # include "opensubdiv_capi.h" #endif -/* assumes MLoop's are layed out 4 for each poly, in order */ +/* assumes MLoop's are laid out 4 for each poly, in order */ #define USE_LOOP_LAYOUT_FAST static CCGDerivedMesh *getCCGDerivedMesh(CCGSubSurf *ss, @@ -1276,7 +1276,7 @@ void subsurf_copy_grid_paint_mask(DerivedMesh *dm, const MPoly *mpoly, } } -/* utility functon */ +/* utility function */ BLI_INLINE void ccgDM_to_MVert(MVert *mv, const CCGKey *key, CCGElem *elem) { copy_v3_v3(mv->co, CCG_elem_co(key, elem)); @@ -1349,7 +1349,7 @@ static void ccgDM_copyFinalVertArray(DerivedMesh *dm, MVert *mvert) } -/* utility functon */ +/* utility function */ BLI_INLINE void ccgDM_to_MEdge(MEdge *med, const int v1, const int v2, const short flag) { med->v1 = v1; @@ -5134,7 +5134,7 @@ static bool subsurf_use_gpu_backend(SubsurfFlags flags) { #ifdef WITH_OPENSUBDIV /* Use GPU backend if it's a last modifier in the stack - * and user choosed to use any of the OSD compute devices, + * and user chose to use any of the OSD compute devices, * but also check if GPU has all needed features. */ return @@ -5234,7 +5234,7 @@ struct DerivedMesh *subsurf_make_derived_from_derived( if (smd->mCache && (flags & SUBSURF_IS_FINAL_CALC)) { #ifdef WITH_OPENSUBDIV - /* With OpenSubdiv enabled we always tries to re-use previos + /* With OpenSubdiv enabled we always tries to re-use previous * subsurf structure in order to save computation time since * re-creation is rather a complicated business. * diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c index fdc26fccda3..345168e2000 100644 --- a/source/blender/blenkernel/intern/text.c +++ b/source/blender/blenkernel/intern/text.c @@ -355,7 +355,7 @@ static void text_from_buf(Text *text, const unsigned char *buffer, const int len * - rest of line (if last line in file hasn't got \n terminator). * in this case content of such line would be used to fill text line buffer * - file is empty. in this case new line is needed to start editing from. - * - last characted in buffer is \n. in this case new line is needed to + * - last character in buffer is \n. in this case new line is needed to * deal with newline at end of file. (see [#28087]) (sergey) */ if (llen != 0 || text->nlines == 0 || buffer[len - 1] == '\n') { TextLine *tmp; diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index bb61888a2c0..a3536cd0d68 100644 --- a/source/blender/blenkernel/intern/tracking.c +++ b/source/blender/blenkernel/intern/tracking.c @@ -1606,7 +1606,7 @@ MovieTrackingPlaneMarker *BKE_tracking_plane_marker_insert(MovieTrackingPlaneTra int a = plane_track->markersnr; /* Find position in array where to add new marker. */ - /* TODO(sergey): we coud use bisect to speed things up. */ + /* TODO(sergey): we could use bisect to speed things up. */ while (a--) { if (plane_track->markers[a].framenr < plane_marker->framenr) { break; diff --git a/source/blender/blenkernel/intern/tracking_region_tracker.c b/source/blender/blenkernel/intern/tracking_region_tracker.c index 106dd125575..dcc61f409fc 100644 --- a/source/blender/blenkernel/intern/tracking_region_tracker.c +++ b/source/blender/blenkernel/intern/tracking_region_tracker.c @@ -149,7 +149,7 @@ static ImBuf *tracking_context_get_keyframed_ibuf(MovieClip *clip, MovieClipUser return tracking_context_get_frame_ibuf(clip, user, clip_flag, keyed_framenr); } -/* Get image buffer which si used as referece for track. */ +/* Get image buffer which si used as reference for track. */ static ImBuf *tracking_context_get_reference_ibuf(MovieClip *clip, MovieClipUser *user, int clip_flag, MovieTrackingTrack *track, int curfra, bool backwards, MovieTrackingMarker **reference_marker) diff --git a/source/blender/blenkernel/intern/unit.c b/source/blender/blenkernel/intern/unit.c index 8606da0743b..3a903eb31c1 100644 --- a/source/blender/blenkernel/intern/unit.c +++ b/source/blender/blenkernel/intern/unit.c @@ -321,7 +321,7 @@ static const bUnitDef *unit_best_fit( if (suppress && (unit->flag & B_UNIT_DEF_SUPPRESS)) continue; - /* scale down scalar so 1cm doesnt convert to 10mm because of float error */ + /* scale down scalar so 1cm doesn't convert to 10mm because of float error */ if (UNLIKELY(unit->flag & B_UNIT_DEF_TENTH)) { if (value_abs >= unit->scalar * (0.1 - EPS)) { return unit; @@ -418,7 +418,7 @@ static size_t unit_as_string(char *str, int len_max, double value, int prec, con #endif } - /* terminate no matter whats done with padding above */ + /* terminate no matter what's done with padding above */ if (i >= len_max) i = len_max - 1; diff --git a/source/blender/collada/AnimationExporter.cpp b/source/blender/collada/AnimationExporter.cpp index 6e4561809fd..1cacee836ba 100644 --- a/source/blender/collada/AnimationExporter.cpp +++ b/source/blender/collada/AnimationExporter.cpp @@ -139,7 +139,7 @@ void AnimationExporter::create_sampled_animation(int channel_count, * Export all animation FCurves of an Object. * * Note: This uses the keyframes as sample points, - * and exports "baked keyframes" while keeping the tangent infromation + * and exports "baked keyframes" while keeping the tangent information * of the FCurves intact. This works for simple cases, but breaks * especially when negative scales are involved in the animation. * diff --git a/source/blender/collada/ControllerExporter.cpp b/source/blender/collada/ControllerExporter.cpp index 5673d33fcbf..fa3f0267314 100644 --- a/source/blender/collada/ControllerExporter.cpp +++ b/source/blender/collada/ControllerExporter.cpp @@ -398,7 +398,7 @@ std::string ControllerExporter::add_morph_weights(Key *key, Object *ob) return source_id; } -//Added to implemente support for animations. +//Added to implement support for animations. void ControllerExporter::add_weight_extras(Key *key) { // can also try the base element and param alternative diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp index d121268d8d9..1f24010b04e 100644 --- a/source/blender/collada/MeshImporter.cpp +++ b/source/blender/collada/MeshImporter.cpp @@ -183,7 +183,7 @@ void VCOLDataWrapper::get_vcol(int v_index, MLoopCol *mloopcol) case COLLADAFW::MeshVertexData::DATA_TYPE_FLOAT: { COLLADAFW::ArrayPrimitiveType<float> *values = mVData->getFloatValues(); - if (values->empty() || values->getCount() <= (v_index * stride + 2)) return; // xxx need to create an eror instead + if (values->empty() || values->getCount() <= (v_index * stride + 2)) return; // xxx need to create an error instead mloopcol->r = unit_float_to_uchar_clamp((*values)[v_index * stride]); mloopcol->g = unit_float_to_uchar_clamp((*values)[v_index * stride + 1]); @@ -194,7 +194,7 @@ void VCOLDataWrapper::get_vcol(int v_index, MLoopCol *mloopcol) case COLLADAFW::MeshVertexData::DATA_TYPE_DOUBLE: { COLLADAFW::ArrayPrimitiveType<double> *values = mVData->getDoubleValues(); - if (values->empty() || values->getCount() <= (v_index * stride + 2)) return; // xxx need to create an eror instead + if (values->empty() || values->getCount() <= (v_index * stride + 2)) return; // xxx need to create an error instead mloopcol->r = unit_float_to_uchar_clamp((*values)[v_index * stride]); mloopcol->g = unit_float_to_uchar_clamp((*values)[v_index * stride + 1]); @@ -546,7 +546,7 @@ unsigned int MeshImporter::get_loose_edge_count(COLLADAFW::Mesh *mesh) { } // ================================================================= -// This functin is copied from source/blender/editors/mesh/mesh_data.c +// This function is copied from source/blender/editors/mesh/mesh_data.c // // TODO: (As discussed with sergey-) : // Maybe move this function to blenderkernel/intern/mesh.c @@ -585,7 +585,7 @@ void MeshImporter::mesh_add_edges(Mesh *mesh, int len) // ================================================================= // Read all loose edges. // Important: This function assumes that all edges from existing -// faces have allready been generated and added to me->medge +// faces have already been generated and added to me->medge // So this function MUST be called after read_faces() (see below) // ================================================================= void MeshImporter::read_lines(COLLADAFW::Mesh *mesh, Mesh *me) @@ -679,7 +679,7 @@ void MeshImporter::read_polys(COLLADAFW::Mesh *collada_mesh, Mesh *me) unsigned int vertex_count = mp->getGroupedVerticesVertexCount(group_index); for (unsigned int vertex_index = 0; vertex_index < vertex_count - 2; vertex_index++) { - // For each triangle store indeces of its 3 vertices + // For each triangle store indices of its 3 vertices unsigned int triangle_vertex_indices[3] = {first_vertex, position_indices[1], position_indices[2]}; set_poly_indices(mpoly, mloop, loop_index, triangle_vertex_indices, 3); @@ -944,7 +944,7 @@ static bool bc_has_same_material_configuration(Object *ob1, Object *ob2) /** * - * Caution here: This code assumes tha all materials are assigned to Object + * Caution here: This code assumes that all materials are assigned to Object * and no material is assigned to Data. * That is true right after the objects have been imported. * @@ -1078,7 +1078,7 @@ MTFace *MeshImporter::assign_material_to_geom(COLLADAFW::MaterialBinding cmateri Material *ma = uid_material_map[ma_uid]; - // Attention! This temporaly assigns material to object on purpose! + // Attention! This temporarily assigns material to object on purpose! // See note above. ob->actcol=0; assign_material(m_bmain, ob, ma, mat_index + 1, BKE_MAT_ASSIGN_OBJECT); @@ -1138,7 +1138,7 @@ Object *MeshImporter::create_mesh_object(COLLADAFW::Node *node, COLLADAFW::Insta { const COLLADAFW::UniqueId *geom_uid = &geom->getInstanciatedObjectId(); - // check if node instanciates controller or geometry + // check if node instantiates controller or geometry if (isController) { geom_uid = armature_importer->get_geometry_uid(*geom_uid); @@ -1241,7 +1241,7 @@ bool MeshImporter::write_geometry(const COLLADAFW::Geometry *geom) // BKE_mesh_calc_edges(me, false, false); // read_lines() must be called after the face edges have been generated. - // Oterwise the loose edges will be silently deleted again. + // Otherwise the loose edges will be silently deleted again. read_lines(mesh, me); return true; diff --git a/source/blender/collada/SceneExporter.cpp b/source/blender/collada/SceneExporter.cpp index a0d1b6b5333..b571b7503d5 100644 --- a/source/blender/collada/SceneExporter.cpp +++ b/source/blender/collada/SceneExporter.cpp @@ -59,7 +59,7 @@ void SceneExporter::exportHierarchy(bContext *C, Scene *sce) ob->id.tag |= LIB_TAG_DOIT; } - // Now find all exportable base ojects (highest in export hierarchy) + // Now find all exportable base objects (highest in export hierarchy) for (node = this->export_settings->export_set; node; node = node->next) { Object *ob = (Object *) node->link; if (bc_is_base_node(this->export_settings->export_set, ob)) { diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp index 07e2c834221..ec45a6dee36 100644 --- a/source/blender/collada/collada_utils.cpp +++ b/source/blender/collada/collada_utils.cpp @@ -768,7 +768,7 @@ float bc_get_property(Bone *bone, std::string key, float def) /** * Read a custom bone property and convert to matrix - * Return true if conversion was succesfull + * Return true if conversion was successful * * Return false if: * - the property does not exist diff --git a/source/blender/compositor/intern/COM_Converter.cpp b/source/blender/compositor/intern/COM_Converter.cpp index c9181905908..bc41be24e71 100644 --- a/source/blender/compositor/intern/COM_Converter.cpp +++ b/source/blender/compositor/intern/COM_Converter.cpp @@ -394,7 +394,7 @@ Node *Converter::convert(bNode *b_node) case CMP_NODE_TRACKPOS: node = new TrackPositionNode(b_node); break; - /* not inplemented yet */ + /* not implemented yet */ case CMP_NODE_PIXELATE: node = new PixelateNode(b_node); break; diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.cpp b/source/blender/compositor/intern/COM_ExecutionGroup.cpp index c4ef21d1f13..603254baba2 100644 --- a/source/blender/compositor/intern/COM_ExecutionGroup.cpp +++ b/source/blender/compositor/intern/COM_ExecutionGroup.cpp @@ -437,7 +437,7 @@ void ExecutionGroup::determineChunkRect(rcti *rect, const unsigned int chunkNumb MemoryBuffer *ExecutionGroup::allocateOutputBuffer(int /*chunkNumber*/, rcti *rect) { - // we asume that this method is only called from complex execution groups. + // we assume that this method is only called from complex execution groups. NodeOperation *operation = this->getOutputOperation(); if (operation->isWriteBufferOperation()) { WriteBufferOperation *writeOperation = (WriteBufferOperation *)operation; diff --git a/source/blender/compositor/intern/COM_MemoryProxy.h b/source/blender/compositor/intern/COM_MemoryProxy.h index 884b32fd6ff..20368eebde0 100644 --- a/source/blender/compositor/intern/COM_MemoryProxy.h +++ b/source/blender/compositor/intern/COM_MemoryProxy.h @@ -39,7 +39,7 @@ class WriteBufferOperation; class MemoryProxy { private: /** - * \brief reference to the ouput operation of the executiongroup + * \brief reference to the output operation of the executiongroup */ WriteBufferOperation *m_writeBufferOperation; diff --git a/source/blender/compositor/nodes/COM_DilateErodeNode.h b/source/blender/compositor/nodes/COM_DilateErodeNode.h index a3d26ada95b..0033fa558fe 100644 --- a/source/blender/compositor/nodes/COM_DilateErodeNode.h +++ b/source/blender/compositor/nodes/COM_DilateErodeNode.h @@ -30,7 +30,7 @@ * \ingroup Node */ class DilateErodeNode : public Node { - NodeBlurData m_alpha_blur; /* only used for blurring alpha, since the dilate/erode node doesnt have this */ + NodeBlurData m_alpha_blur; /* only used for blurring alpha, since the dilate/erode node doesn't have this */ public: DilateErodeNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; diff --git a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp index d570424cb69..c3fc632c05d 100644 --- a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp @@ -128,7 +128,7 @@ void FastGaussianBlurOperation::IIR_gauss(MemoryBuffer *src, float sigma, unsign if ((xy < 1) || (xy > 3)) xy = 3; // XXX The YVV macro defined below explicitly expects sources of at least 3x3 pixels, - // so just skiping blur along faulty direction if src's def is below that limit! + // so just skipping blur along faulty direction if src's def is below that limit! if (src_width < 3) xy &= ~1; if (src_height < 3) xy &= ~2; if (xy < 1) return; diff --git a/source/blender/compositor/operations/COM_ScaleOperation.cpp b/source/blender/compositor/operations/COM_ScaleOperation.cpp index b498b359144..ff6b2438e9b 100644 --- a/source/blender/compositor/operations/COM_ScaleOperation.cpp +++ b/source/blender/compositor/operations/COM_ScaleOperation.cpp @@ -201,7 +201,7 @@ bool ScaleAbsoluteOperation::determineDependingAreaOfInterest(rcti *input, ReadB } -// Absolute fixed siez +// Absolute fixed size ScaleFixedSizeOperation::ScaleFixedSizeOperation() : BaseScaleOperation() { this->addInputSocket(COM_DT_COLOR, COM_SC_NO_RESIZE); diff --git a/source/blender/compositor/operations/COM_SunBeamsOperation.cpp b/source/blender/compositor/operations/COM_SunBeamsOperation.cpp index 40f2ee226ae..fc3dc6acca0 100644 --- a/source/blender/compositor/operations/COM_SunBeamsOperation.cpp +++ b/source/blender/compositor/operations/COM_SunBeamsOperation.cpp @@ -141,7 +141,7 @@ struct BufferLineAccumulator { /** * Perform the actual accumulation along a ray segment from source to pt. - * Only pixels withing dist_min..dist_max contribute. + * Only pixels within dist_min..dist_max contribute. * * The loop runs backwards(!) over the primary sector space axis u, i.e. increasing distance to pt. * After each step it decrements v by dv < 1, adding a buffer shift when necessary. diff --git a/source/blender/compositor/operations/COM_VectorBlurOperation.cpp b/source/blender/compositor/operations/COM_VectorBlurOperation.cpp index d14d745d049..76550bf4119 100644 --- a/source/blender/compositor/operations/COM_VectorBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_VectorBlurOperation.cpp @@ -761,7 +761,7 @@ void zbuf_accumulate_vecblur( } /* blend with a falloff. this fixes the ugly effect you get with - * a fast moving object. then it looks like a solid object overlayed + * a fast moving object. then it looks like a solid object overlaid * over a very transparent moving version of itself. in reality, the * whole object should become transparent if it is moving fast, be * we don't know what is behind it so we don't do that. this hack diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index e8adabb2668..a3eac1120db 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -804,11 +804,11 @@ void DepsgraphRelationBuilder::build_constraints(ID *id, /* Standard object relation. */ // TODO: loc vs rot vs scale? if (&ct->tar->id == id) { - /* Constraint targetting own object: + /* Constraint targeting own object: * - This case is fine IFF we're dealing with a bone * constraint pointing to its own armature. In that * case, it's just transform -> bone. - * - If however it is a real self targetting case, just + * - If however it is a real self targeting case, just * make it depend on the previous constraint (or the * pre-constraint state). */ diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.h b/source/blender/depsgraph/intern/builder/deg_builder_relations.h index 4a8e91f18db..35e17cd0dc1 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.h +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.h @@ -290,7 +290,7 @@ protected: /* TODO(sergey): All those is_same* functions are to be generalized. */ - /* Check whether two keys correponds to the same bone from same armature. + /* Check whether two keys corresponds to the same bone from same armature. * * This is used by drivers relations builder to avoid possible fake * dependency cycle when one bone property drives another property of the diff --git a/source/blender/depsgraph/intern/depsgraph.cc b/source/blender/depsgraph/intern/depsgraph.cc index 241c3fb9ac3..681af26637c 100644 --- a/source/blender/depsgraph/intern/depsgraph.cc +++ b/source/blender/depsgraph/intern/depsgraph.cc @@ -142,7 +142,7 @@ static bool pointer_to_component_node_criteria( else if (ptr->type == &RNA_Bone) { Bone *bone = (Bone *)ptr->data; /* armature-level bone, but it ends up going to bone component anyway */ - // NOTE: the ID in thise case will end up being bArmature. + // NOTE: the ID in this case will end up being bArmature. *type = DEG_NODE_TYPE_BONE; *subdata = bone->name; return true; diff --git a/source/blender/depsgraph/intern/depsgraph_types.h b/source/blender/depsgraph/intern/depsgraph_types.h index 0e48be6b1e2..0478d97cf6b 100644 --- a/source/blender/depsgraph/intern/depsgraph_types.h +++ b/source/blender/depsgraph/intern/depsgraph_types.h @@ -198,7 +198,7 @@ typedef enum eDepsOperation_Code { * - "READY" This (internal, noop is used to signal that all pre-IK * operations are done. Its role is to help mediate situations * where cyclic relations may otherwise form (i.e. one bone in - * chain targetting another in same chain, + * chain targeting another in same chain, * * - "DONE" This noop is used to signal that the bone's final pose * transform can be read by others diff --git a/source/blender/gpu/intern/gpu_shader.c b/source/blender/gpu/intern/gpu_shader.c index 66945b13aba..5e35b9279d4 100644 --- a/source/blender/gpu/intern/gpu_shader.c +++ b/source/blender/gpu/intern/gpu_shader.c @@ -280,7 +280,7 @@ static void gpu_dump_shaders(const char **code, const int num_shaders, const cha } /* We use the same shader index for shaders in the same program. - * So we call this function once before calling for the invidual shaders. */ + * So we call this function once before calling for the individual shaders. */ static int shader_index = 0; if (code == NULL) { shader_index++; diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h index 0c7341b0fae..e9bc0f41980 100644 --- a/source/blender/makesdna/DNA_ID.h +++ b/source/blender/makesdna/DNA_ID.h @@ -176,9 +176,9 @@ enum ePreviewImage_Flag { /* for PreviewImage->tag */ enum { - PRV_TAG_DEFFERED = (1 << 0), /* Actual loading of preview is deffered. */ - PRV_TAG_DEFFERED_RENDERING = (1 << 1), /* Deffered preview is being loaded. */ - PRV_TAG_DEFFERED_DELETE = (1 << 2), /* Deffered preview should be deleted asap. */ + PRV_TAG_DEFFERED = (1 << 0), /* Actual loading of preview is deferred. */ + PRV_TAG_DEFFERED_RENDERING = (1 << 1), /* Deferred preview is being loaded. */ + PRV_TAG_DEFFERED_DELETE = (1 << 2), /* Deferred preview should be deleted asap. */ }; typedef struct PreviewImage { diff --git a/source/blender/makesdna/DNA_armature_types.h b/source/blender/makesdna/DNA_armature_types.h index f1fe370788d..a7c9c934304 100644 --- a/source/blender/makesdna/DNA_armature_types.h +++ b/source/blender/makesdna/DNA_armature_types.h @@ -111,7 +111,7 @@ typedef struct bArmature { unsigned int layer_used; /* for UI, to show which layers are there */ unsigned int layer, layer_protected; /* for buttons to work, both variables in this order together */ -// XXX deprecated... old animaton system (armature only viz) --- +// XXX deprecated... old animation system (armature only viz) --- short ghostep, ghostsize; /* number of frames to ghosts to show, and step between them */ short ghosttype, pathsize; /* ghost drawing options and number of frames between points of path */ int ghostsf, ghostef; /* start and end frames of ghost-drawing range */ diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h index 2ae686d178e..0239c236e5c 100644 --- a/source/blender/makesdna/DNA_constraint_types.h +++ b/source/blender/makesdna/DNA_constraint_types.h @@ -121,7 +121,7 @@ typedef struct bPythonConstraint { ListBase targets; /* a list of targets that this constraint has (bConstraintTarget-s) */ struct Object *tar; /* target from previous implementation (version-patch sets this to NULL on file-load) */ - char subtarget[64]; /* subtarger from previous implentation (version-patch sets this to "" on file-load), MAX_ID_NAME-2 */ + char subtarget[64]; /* subtarger from previous implementation (version-patch sets this to "" on file-load), MAX_ID_NAME-2 */ } bPythonConstraint; @@ -641,7 +641,7 @@ typedef enum eTrackTo_Flags { TARGET_Z_UP = (1<<0) } eTrackTo_Flags; -/* Strech To Constraint -> volmode */ +/* Stretch To Constraint -> volmode */ typedef enum eStretchTo_VolMode { VOLUME_XZ = 0, VOLUME_X = 1, diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h index 45f2d6c70e4..ed2f4d69392 100644 --- a/source/blender/makesdna/DNA_gpencil_types.h +++ b/source/blender/makesdna/DNA_gpencil_types.h @@ -160,7 +160,7 @@ typedef struct bGPDstroke { struct bGPDstroke *next, *prev; bGPDspoint *points; /* array of data-points for stroke */ - bGPDtriangle *triangles;/* tesselated triangles for GP Fill */ + bGPDtriangle *triangles;/* tessellated triangles for GP Fill */ int totpoints; /* number of data-points in array */ int tot_triangles; /* number of triangles in array */ diff --git a/source/blender/makesdna/DNA_mask_types.h b/source/blender/makesdna/DNA_mask_types.h index b84292d0519..9d4b68b7242 100644 --- a/source/blender/makesdna/DNA_mask_types.h +++ b/source/blender/makesdna/DNA_mask_types.h @@ -88,7 +88,7 @@ typedef struct MaskSplinePoint { typedef struct MaskSpline { struct MaskSpline *next, *prev; - short flag; /* defferent spline flag (closed, ...) */ + short flag; /* different spline flag (closed, ...) */ char offset_mode; /* feather offset method */ char weight_interp; /* weight interpolation */ diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index 00ae9ff8b60..ad5f3768b93 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -870,7 +870,7 @@ typedef struct SimpleDeformModifierData { float limit[2]; /* lower and upper limit */ char mode; /* deform function */ - char axis; /* lock axis (for taper and strech) */ + char axis; /* lock axis (for taper and stretch) */ char deform_axis; /* axis to perform the deform on (default is X, but can be overridden by origin */ char flag; diff --git a/source/blender/makesdna/DNA_object_fluidsim_types.h b/source/blender/makesdna/DNA_object_fluidsim_types.h index 0b0c1c40ef4..9ddae38edf2 100644 --- a/source/blender/makesdna/DNA_object_fluidsim_types.h +++ b/source/blender/makesdna/DNA_object_fluidsim_types.h @@ -102,7 +102,7 @@ typedef struct FluidsimSettings { /* additional flags depending on the type, lower short contains flags * to check validity, higher short additional flags */ short typeFlags; - /* switch off velocity genration, volume init type for fluid/obstacles (volume=1, shell=2, both=3) */ + /* switch off velocity generation, volume init type for fluid/obstacles (volume=1, shell=2, both=3) */ char domainNovecgen, volumeInitType; /* boundary "stickiness" for part slip values */ diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h index a96354f05c1..26a99f49d86 100644 --- a/source/blender/makesdna/DNA_particle_types.h +++ b/source/blender/makesdna/DNA_particle_types.h @@ -106,7 +106,7 @@ typedef struct ParticleData { int totkey; /* amount of hair or keyed keys*/ - float time, lifetime; /* dietime is not nescessarily time+lifetime as */ + float time, lifetime; /* dietime is not necessarily time+lifetime as */ float dietime; /* particles can die unnaturally (collision). */ /* WARNING! Those two indices, when not affected to vertices, are for !!! TESSELLATED FACES !!!, not POLYGONS! */ @@ -355,7 +355,7 @@ typedef enum eParticleDrawFlag { } eParticleDrawFlag; /* part->type */ -/* hair is allways baked static in object/geometry space */ +/* hair is always baked static in object/geometry space */ /* other types (normal particles) are in global space and not static baked */ #define PART_EMITTER 0 //#define PART_REACTOR 1 diff --git a/source/blender/makesdna/DNA_rigidbody_types.h b/source/blender/makesdna/DNA_rigidbody_types.h index 19e49644816..dbfd3921b8b 100644 --- a/source/blender/makesdna/DNA_rigidbody_types.h +++ b/source/blender/makesdna/DNA_rigidbody_types.h @@ -102,7 +102,7 @@ typedef struct RigidBodyOb { short shape; /* (eRigidBody_Shape) collision shape to use */ int flag; /* (eRigidBodyOb_Flag) */ - int col_groups; /* Collision groups that determines wich rigid bodies can collide with each other */ + int col_groups; /* Collision groups that determines which rigid bodies can collide with each other */ short mesh_source; /* (eRigidBody_MeshSource) mesh source for mesh based collision shapes */ short pad; diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h index ef076c98b5f..6e2fd412445 100644 --- a/source/blender/makesdna/DNA_sequence_types.h +++ b/source/blender/makesdna/DNA_sequence_types.h @@ -126,7 +126,7 @@ typedef struct Strip { * each of the strips uses a different sequence structure. * * \warning The first part identical to ID (for use in ipo's) - * the commend above is historic, probably we can drop the ID compatibility, + * the comment above is historic, probably we can drop the ID compatibility, * but take care making this change. * * \warning This is really a 'Strip' in the UI!, name is highly confusing. diff --git a/source/blender/makesdna/DNA_smoke_types.h b/source/blender/makesdna/DNA_smoke_types.h index d74d46aebbd..ee7e080f39b 100644 --- a/source/blender/makesdna/DNA_smoke_types.h +++ b/source/blender/makesdna/DNA_smoke_types.h @@ -113,7 +113,7 @@ enum { #define SM_HRES_LINEAR 1 #define SM_HRES_FULLSAMPLE 2 -/* smoke data fileds (active_fields) */ +/* smoke data fields (active_fields) */ #define SM_ACTIVE_HEAT (1<<0) #define SM_ACTIVE_FIRE (1<<1) #define SM_ACTIVE_COLORS (1<<2) diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 6879c3044a6..e94364e8a65 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -423,7 +423,7 @@ typedef struct SpaceNla { /* SpaceNla.flag */ typedef enum eSpaceNla_Flag { - /* flags (1<<0), (1<<1), and (1<<3) are deprecated flags from old verisons */ + /* flags (1<<0), (1<<1), and (1<<3) are deprecated flags from old versions */ /* draw timing in seconds instead of frames */ SNLA_DRAWTIME = (1 << 2), diff --git a/source/blender/makesdna/DNA_tracking_types.h b/source/blender/makesdna/DNA_tracking_types.h index 42b72c1ff93..bfd9edceab4 100644 --- a/source/blender/makesdna/DNA_tracking_types.h +++ b/source/blender/makesdna/DNA_tracking_types.h @@ -108,7 +108,7 @@ typedef struct MovieTrackingTrack { char name[64]; /* MAX_NAME */ - /* ** setings ** */ + /* ** settings ** */ /* positions of left-bottom and right-top corners of pattern (in unified 0..1 units, * relative to marker->pos) diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index e8cc4fbe38f..aea5f0fd87b 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -59,7 +59,7 @@ typedef enum eUIFont_ID { UIFONT_CUSTOM2 = 3 } eUIFont_ID; -/* default fonts to load/initalize */ +/* default fonts to load/initialize */ /* first font is the default (index 0), others optional */ typedef struct uiFont { struct uiFont *next, *prev; @@ -168,7 +168,7 @@ typedef struct ThemeUI { uiWidgetStateColors wcol_state; - uiPanelColors panel; /* depricated, but we keep it for do_versions (2.66.1) */ + uiPanelColors panel; /* deprecated, but we keep it for do_versions (2.66.1) */ char widget_emboss[4]; @@ -513,7 +513,7 @@ typedef struct UserDef { short rvisize; /* rotating view icon size */ short rvibright; /* rotating view icon brightness */ short recent_files; /* maximum number of recently used files to remember */ - short smooth_viewtx; /* miliseconds to spend spinning the view */ + short smooth_viewtx; /* milliseconds to spend spinning the view */ short glreslimit; short curssize; short color_picker_type; /* eColorPicker_Types */ @@ -670,7 +670,7 @@ typedef enum eUserpref_UI_Flag { USER_PLAINMENUS = (1 << 5), USER_LOCK_CURSOR_ADJUST = (1 << 6), /* Avoid accidentally adjusting the layout - * (exact behavior may change based on whats considered reasonable to lock down). */ + * (exact behavior may change based on what's considered reasonable to lock down). */ USER_UIFLAG_DEPRECATED_7 = (1 << 7), USER_ALLWINCODECS = (1 << 8), USER_MENUOPENAUTO = (1 << 9), diff --git a/source/blender/makesdna/DNA_windowmanager_types.h b/source/blender/makesdna/DNA_windowmanager_types.h index 7e55eb4633e..c76a447097e 100644 --- a/source/blender/makesdna/DNA_windowmanager_types.h +++ b/source/blender/makesdna/DNA_windowmanager_types.h @@ -174,7 +174,7 @@ enum { # endif #endif -/* the savable part, rest of data is local in ghostwinlay */ +/* the saveable part, rest of data is local in ghostwinlay */ typedef struct wmWindow { struct wmWindow *next, *prev; diff --git a/source/blender/makesdna/intern/dna_genfile.c b/source/blender/makesdna/intern/dna_genfile.c index 9f29249c239..077bae741b8 100644 --- a/source/blender/makesdna/intern/dna_genfile.c +++ b/source/blender/makesdna/intern/dna_genfile.c @@ -102,7 +102,7 @@ * * ALLOWED AND TESTED CHANGES IN STRUCTS: * - type change (a char to float will be divided by 255) - * - location within a struct (everthing can be randomly mixed up) + * - location within a struct (everything can be randomly mixed up) * - struct within struct (within struct etc), this is recursive * - adding new elements, will be default initialized zero * - removing elements @@ -901,7 +901,7 @@ static int elem_strcmp(const char *name, const char *oname) * \param type Current field type name * \param name Current field name * \param old Pointer to struct information in sdna - * \return true when existsing, false otherwise. + * \return true when existing, false otherwise. */ static bool elem_exists( const SDNA *sdna, @@ -1259,7 +1259,7 @@ void DNA_struct_switch_endian(const SDNA *oldsdna, int oldSDNAnr, char *data) else if (ELEM(spc[0], SDNA_TYPE_INT, SDNA_TYPE_FLOAT)) { /* note, intentionally ignore long/ulong here these could be 4 or 8 bits, * but turns out we only used for runtime vars and - * only once for a struct type thats no longer used. */ + * only once for a struct type that's no longer used. */ BLI_endian_switch_int32_array((int32_t *)cur, DNA_elem_array_size(name)); } diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index 3b8d0e01ace..bf94c07baa1 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -984,7 +984,7 @@ static int make_structDNA(const char *baseDirectory, FILE *file, FILE *file_offs printf("Running makesdna at debug level %d\n", debugSDNA); } - /* the longest known struct is 50k, so we assume 100k is sufficent! */ + /* the longest known struct is 50k, so we assume 100k is sufficient! */ namedata = MEM_callocN(maxdata, "namedata"); typedata = MEM_callocN(maxdata, "typedata"); structdata = MEM_callocN(maxdata, "structdata"); @@ -1258,7 +1258,7 @@ int main(int argc, char **argv) return(return_status); } -/* handy but fails on struct bounds which makesdna doesnt care about +/* handy but fails on struct bounds which makesdna doesn't care about * with quite the same strictness as GCC does */ #if 0 /* include files for automatic dependencies */ diff --git a/source/blender/makesrna/RNA_types.h b/source/blender/makesrna/RNA_types.h index 05a166f4664..0d972a118e8 100644 --- a/source/blender/makesrna/RNA_types.h +++ b/source/blender/makesrna/RNA_types.h @@ -400,7 +400,7 @@ typedef struct ParameterDynAlloc { typedef enum FunctionFlag { /***** Options affecting callback signature. *****/ - /* Those add additionnal parameters at the beginning of the C callback, like that: + /* Those add additional parameters at the beginning of the C callback, like that: * rna_my_func([ID *_selfid], * [<DNA_STRUCT> *self|StructRNA *type], * [Main *bmain], diff --git a/source/blender/makesrna/intern/rna_armature.c b/source/blender/makesrna/intern/rna_armature.c index 7af3746b855..6c728ac50e5 100644 --- a/source/blender/makesrna/intern/rna_armature.c +++ b/source/blender/makesrna/intern/rna_armature.c @@ -886,7 +886,7 @@ static void rna_def_edit_bone(BlenderRNA *brna) /* calculated and read only, not actual data access */ prop = RNA_def_property(srna, "matrix", PROP_FLOAT, PROP_MATRIX); - /*RNA_def_property_float_sdna(prop, NULL, ""); *//* doesnt access any real data */ + /*RNA_def_property_float_sdna(prop, NULL, ""); *//* doesn't access any real data */ RNA_def_property_multi_array(prop, 2, rna_matrix_dimsize_4x4); //RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_flag(prop, PROP_THICK_WRAP); /* no reference to original data */ diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c index 90af65497a4..625ef7db2dc 100644 --- a/source/blender/makesrna/intern/rna_gpencil.c +++ b/source/blender/makesrna/intern/rna_gpencil.c @@ -263,7 +263,7 @@ static const EnumPropertyItem *rna_Object_parent_type_itemf( Object *par = gpl->parent; if (par->type == OB_ARMATURE) { - /* special hack: prevents this being overrided */ + /* special hack: prevents this being overridden */ RNA_enum_items_add_value(&item, &totitem, &parent_type_items[1], PARSKEL); RNA_enum_items_add_value(&item, &totitem, parent_type_items, PARBONE); } diff --git a/source/blender/makesrna/intern/rna_lattice.c b/source/blender/makesrna/intern/rna_lattice.c index bbc0c251897..782ca0d76b3 100644 --- a/source/blender/makesrna/intern/rna_lattice.c +++ b/source/blender/makesrna/intern/rna_lattice.c @@ -103,7 +103,7 @@ static void rna_Lattice_update_data(Main *UNUSED(bmain), Scene *UNUSED(scene), P /* copy settings to editlattice, * we could split this up differently (one update call per property) - * but for now thats overkill + * but for now that's overkill */ static void rna_Lattice_update_data_editlatt(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) { diff --git a/source/blender/makesrna/intern/rna_linestyle.c b/source/blender/makesrna/intern/rna_linestyle.c index bcd8ab054ae..b50102079a9 100644 --- a/source/blender/makesrna/intern/rna_linestyle.c +++ b/source/blender/makesrna/intern/rna_linestyle.c @@ -591,7 +591,7 @@ static void rna_def_modifier_type_common( {LS_VALUE_MULT, "MULTIPLY", 0, "Multiply", ""}, {LS_VALUE_DIV, "DIVIDE", 0, "Divide", ""}, {LS_VALUE_DIFF, "DIFFERENCE", 0, "Difference", ""}, - {LS_VALUE_MIN, "MININUM", 0, "Minimum", ""}, + {LS_VALUE_MIN, "MINIMUM", 0, "Minimum", ""}, {LS_VALUE_MAX, "MAXIMUM", 0, "Maximum", ""}, {0, NULL, 0, NULL, NULL} }; diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 1d62f438047..4094552d9bc 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -472,7 +472,7 @@ static const EnumPropertyItem *rna_Object_parent_type_itemf(bContext *UNUSED(C), RNA_enum_items_add_value(&item, &totitem, &parent_type_items[2], PARSKEL); } else if (par->type == OB_ARMATURE) { - /* special hack: prevents this being overrided */ + /* special hack: prevents this being overridden */ RNA_enum_items_add_value(&item, &totitem, &parent_type_items[1], PARSKEL); RNA_enum_items_add_value(&item, &totitem, parent_type_items, PARBONE); } diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c index 376a89c65d1..6218de2469d 100644 --- a/source/blender/makesrna/intern/rna_object_api.c +++ b/source/blender/makesrna/intern/rna_object_api.c @@ -49,7 +49,7 @@ static const EnumPropertyItem space_items[] = { {CONSTRAINT_SPACE_WORLD, "WORLD", 0, "World Space", - "The most gobal space in Blender"}, + "The most global space in Blender"}, {CONSTRAINT_SPACE_POSE, "POSE", 0, "Pose Space", "The pose space of a bone (its armature's object space)"}, {CONSTRAINT_SPACE_PARLOCAL, "LOCAL_WITH_PARENT", 0, "Local With Parent", diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c index 7da859c000c..c5d66581ca3 100644 --- a/source/blender/makesrna/intern/rna_object_force.c +++ b/source/blender/makesrna/intern/rna_object_force.c @@ -916,7 +916,7 @@ static void rna_def_pointcache_active(BlenderRNA *brna) /* This first-level RNA pointer also has list of all caches from owning ID. * Those caches items have exact same content as 'active' one, except for that collection, * to prevent ugly recursive layout pattern. - * Note: This shall probably be redone from scratch in a proper way at some poitn, but for now that will do, + * Note: This shall probably be redone from scratch in a proper way at some point, but for now that will do, * and shall not break anything in the API. */ prop = RNA_def_property(srna, "point_caches", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_funcs(prop, "rna_Cache_list_begin", "rna_iterator_listbase_next", diff --git a/source/blender/physics/intern/BPH_mass_spring.cpp b/source/blender/physics/intern/BPH_mass_spring.cpp index 750073dae1f..451959766cb 100644 --- a/source/blender/physics/intern/BPH_mass_spring.cpp +++ b/source/blender/physics/intern/BPH_mass_spring.cpp @@ -553,7 +553,7 @@ BLI_INLINE void cloth_get_grid_location(Implicit_Data *data, float cell_scale, c add_v3_v3(x, cell_offset); } -/* returns next spring forming a continous hair sequence */ +/* returns next spring forming a continuous hair sequence */ BLI_INLINE LinkNode *hair_spring_next(LinkNode *spring_link) { ClothSpring *spring = (ClothSpring *)spring_link->link; diff --git a/source/blender/physics/intern/ConstrainedConjugateGradient.h b/source/blender/physics/intern/ConstrainedConjugateGradient.h index 2d5fb41cc73..8d8dc1ae187 100644 --- a/source/blender/physics/intern/ConstrainedConjugateGradient.h +++ b/source/blender/physics/intern/ConstrainedConjugateGradient.h @@ -175,7 +175,7 @@ struct traits<ConstrainedConjugateGradient<_MatrixType,_UpLo,_FilterMatrixType,_ * ++i; * } while (cg.info()!=Success && i<100); * \endcode - * Note that such a step by step excution is slightly slower. + * Note that such a step by step execution is slightly slower. * * \sa class SimplicialCholesky, DiagonalPreconditioner, IdentityPreconditioner */ diff --git a/source/blender/physics/intern/implicit_blender.c b/source/blender/physics/intern/implicit_blender.c index e4d93b72f73..45030524566 100644 --- a/source/blender/physics/intern/implicit_blender.c +++ b/source/blender/physics/intern/implicit_blender.c @@ -384,7 +384,7 @@ DO_INLINE void inverse_fmatrix(float to[3][3], float from[3][3]) int i2=(i+2)%3; int j1=(j+1)%3; int j2=(j+2)%3; - /** Reverse indexs i&j to take transpose. */ + /** Reverse indexes i&j to take transpose. */ to[j][i] = (from[i1][j1]*from[i2][j2]-from[i1][j2]*from[i2][j1])/d; /** * <pre> diff --git a/source/blender/windowmanager/intern/wm_cursors.c b/source/blender/windowmanager/intern/wm_cursors.c index 24ec3aef759..e789099c799 100644 --- a/source/blender/windowmanager/intern/wm_cursors.c +++ b/source/blender/windowmanager/intern/wm_cursors.c @@ -274,7 +274,7 @@ bool wm_cursor_arrow_move(wmWindow *win, const wmEvent *event) } -/* afer this you can call restore too */ +/* after this you can call restore too */ void WM_cursor_time(wmWindow *win, int nr) { /* 10 8x8 digits */ diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 3a300877750..0084c3a5407 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -2101,7 +2101,7 @@ static int wm_handlers_do_intern(bContext *C, wmEvent *event, ListBase *handlers /* modal handlers can get removed in this loop, we keep the loop this way * * note: check 'handlers->first' because in rare cases the handlers can be cleared - * by the event thats called, for eg: + * by the event that's called, for eg: * * Calling a python script which changes the area.type, see [#32232] */ for (handler = handlers->first; handler && handlers->first; handler = nexthandler) { diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 477699fccaa..38e2d6d21ee 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -964,7 +964,7 @@ static RecentFile *wm_file_history_find(const char *filepath) /** * Write #BLENDER_HISTORY_FILE as-is, without checking the environment - * (thats handled by #wm_history_file_update). + * (that's handled by #wm_history_file_update). */ static void wm_history_file_write(void) { diff --git a/source/blender/windowmanager/intern/wm_files_link.c b/source/blender/windowmanager/intern/wm_files_link.c index 2a0a80fa83c..d8cc5b37b7d 100644 --- a/source/blender/windowmanager/intern/wm_files_link.c +++ b/source/blender/windowmanager/intern/wm_files_link.c @@ -602,7 +602,7 @@ static void lib_relocate_do( BKE_main_id_tag_all(bmain, LIB_TAG_PRE_EXISTING, true); - /* We do not want any instanciation here! */ + /* We do not want any instantiation here! */ wm_link_do(lapp_data, reports, bmain, NULL, NULL); BKE_main_lock(bmain); diff --git a/source/blender/windowmanager/intern/wm_jobs.c b/source/blender/windowmanager/intern/wm_jobs.c index d7df671bce5..92d51c9a400 100644 --- a/source/blender/windowmanager/intern/wm_jobs.c +++ b/source/blender/windowmanager/intern/wm_jobs.c @@ -175,7 +175,7 @@ static wmJob *wm_job_find(wmWindowManager *wm, void *owner, const int job_type) /* ******************* public API ***************** */ /** - * \return current job or adds new job, but doesnt run it. + * \return current job or adds new job, but doesn't run it. * * \note every owner only gets a single job, * adding a new one will stop running job and when stopped it starts the new one. diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c index be147606c46..2834e95527a 100644 --- a/source/blender/windowmanager/intern/wm_keymap.c +++ b/source/blender/windowmanager/intern/wm_keymap.c @@ -121,7 +121,7 @@ static void wm_keymap_item_properties_update_ot(wmKeyMapItem *kmi) wmOperatorType *ot = WM_operatortype_find(kmi->idname, 0); if (ot) { if (ot->srna != kmi->ptr->type) { - /* matches wm_keymap_item_properties_set but doesnt alloc new ptr */ + /* matches wm_keymap_item_properties_set but doesn't alloc new ptr */ WM_operator_properties_create_ptr(kmi->ptr, ot); /* 'kmi->ptr->data' NULL'd above, keep using existing properties. * Note: the operators property types may have changed, diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 4438bd1595f..45084980727 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -262,7 +262,7 @@ char *WM_operator_pystring_ex(bContext *C, wmOperator *op, const bool all_args, } } else { - /* only to get the orginal props for comparisons */ + /* only to get the original props for comparisons */ PointerRNA opptr_default; const bool macro_args_test = ot->macro.first ? macro_args : true; @@ -607,7 +607,7 @@ void WM_operator_properties_sanitize(PointerRNA *ptr, const bool no_context) /** set all props to their default, * \param do_update Only update un-initialized props. * - * \note, theres nothing specific to operators here. + * \note, there's nothing specific to operators here. * this could be made a general function. */ bool WM_operator_properties_default(PointerRNA *ptr, const bool do_update) diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index 40aff4fd8e3..d74657d0c15 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -809,7 +809,7 @@ wmWindow *WM_window_open_temp(bContext *C, int x, int y, int sizex, int sizey, i sizex /= native_pixel_size; sizey /= native_pixel_size; - /* calculate postition */ + /* calculate position */ rcti rect; rect.xmin = x + win_prev->posx - sizex / 2; rect.ymin = y + win_prev->posy - sizey / 2; |