diff options
21 files changed, 22 insertions, 22 deletions
diff --git a/intern/bsp/intern/BSP_CSGMesh.h b/intern/bsp/intern/BSP_CSGMesh.h index 64ecafc2fc0..1fbc8db5286 100644 --- a/intern/bsp/intern/BSP_CSGMesh.h +++ b/intern/bsp/intern/BSP_CSGMesh.h @@ -83,7 +83,7 @@ public : DestroyEdges( ); - // return a new seperate copy of the + // return a new separate copy of the // mesh allocated on the heap. BSP_CSGMesh * diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp index 7d52ab55692..1a1cc99742d 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.cpp +++ b/intern/ghost/intern/GHOST_SystemWin32.cpp @@ -665,7 +665,7 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam, case VK_CONTROL: case VK_MENU: if (!system->m_separateLeftRightInitialized) { - // Check whether this system supports seperate left and right keys + // Check whether this system supports separate left and right keys switch (wParam) { case VK_SHIFT: system->m_separateLeftRight = diff --git a/release/scripts/templates/operator_uv.py b/release/scripts/templates/operator_uv.py index 737059ab666..15ae9d261a0 100644 --- a/release/scripts/templates/operator_uv.py +++ b/release/scripts/templates/operator_uv.py @@ -26,7 +26,7 @@ def main(context): class UvOperator(bpy.types.Operator): '''''' bl_idname = "uv.simple_operator" - bl_label = "Simple Object Operator" + bl_label = "Simple UV Operator" def poll(self, context): obj = context.active_object diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index dff670a847f..e4079eac31b 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -274,7 +274,7 @@ void bone_flip_name (char *name, int strip_number) /* We first check the case with a .### extension, let's find the last period */ if(isdigit(name[len-1])) { - index= strrchr(name, '.'); // last occurrance + index= strrchr(name, '.'); // last occurrence if (index && isdigit(index[1]) ) { // doesnt handle case bone.1abc2 correct..., whatever! if(strip_number==0) strcpy(number, index); diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c index dc9a70f2767..de1c2ef8ddc 100644 --- a/source/blender/blenkernel/intern/cloth.c +++ b/source/blender/blenkernel/intern/cloth.c @@ -478,7 +478,7 @@ DerivedMesh *clothModifier_do(ClothModifierData *clmd, Scene *scene, Object *ob, } } - // unused in the moment, calculated seperately in implicit.c + // unused in the moment, calculated separately in implicit.c clmd->sim_parms->dt = clmd->sim_parms->timescale / clmd->sim_parms->stepsPerFrame; /* handle continuous simulation with the play button */ diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c index e664dd01f4d..d584b18aa84 100644 --- a/source/blender/blenkernel/intern/depsgraph.c +++ b/source/blender/blenkernel/intern/depsgraph.c @@ -809,7 +809,7 @@ DagNode * dag_find_node (DagForest *forest,void * fob) static int ugly_hack_sorry= 1; // prevent type check -/* no checking of existance, use dag_find_node first or dag_get_node */ +/* no checking of existence, use dag_find_node first or dag_get_node */ DagNode * dag_add_node (DagForest *forest, void * fob) { DagNode *node; diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index f7edb2bd146..464f4a2875f 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -1480,7 +1480,7 @@ struct anim *openanim(char *name, int flags) */ -/* forces existance of 1 Image for renderout or nodes, returns Image */ +/* forces existence of 1 Image for renderout or nodes, returns Image */ /* name is only for default, when making new one */ Image *BKE_image_verify_viewer(int type, const char *name) { diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index 7fffd7fc223..7e211f60cd5 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -1817,7 +1817,7 @@ static void vertgroup_flip_name (char *name, int strip_number) /* We first check the case with a .### extension, let's find the last period */ if(isdigit(name[len-1])) { - index= strrchr(name, '.'); // last occurrance + index= strrchr(name, '.'); // last occurrence if (index && isdigit(index[1]) ) { // doesnt handle case bone.1abc2 correct..., whatever! if(strip_number==0) strcpy(number, index); diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index 7b2cf72e311..b31131554bd 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -1447,7 +1447,7 @@ int BKE_ptcache_read_cache(PTCacheID *pid, float cfra, float frs_sec) } } - /* don't read old cache if allready simulated past cached frame */ + /* don't read old cache if already simulated past cached frame */ if(!pm && !pf && cfra1 && cfra1 <= pid->cache->simframe) error = 1; if(cfra1 && cfra1==cfra2) diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index 735c57ea0ce..54cd8691e79 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -1269,7 +1269,7 @@ static int sb_detect_face_collisionCached(float face_v1[3],float face_v2[3],floa normalize_v3(d_nvect); if ( /* isect_line_tri_v3(nv1, nv3, face_v1, face_v2, face_v3, &t, NULL) || - we did that edge allready */ + we did that edge already */ isect_line_tri_v3(nv3, nv4, face_v1, face_v2, face_v3, &t, NULL) || isect_line_tri_v3(nv4, nv1, face_v1, face_v2, face_v3, &t, NULL) ){ Vec3PlusStVec(force,-0.5f,d_nvect); diff --git a/source/blender/blenlib/intern/math_vector.c b/source/blender/blenlib/intern/math_vector.c index d99d96d28ff..bb7c65c4884 100644 --- a/source/blender/blenlib/intern/math_vector.c +++ b/source/blender/blenlib/intern/math_vector.c @@ -69,7 +69,7 @@ void interp_v3_v3v3v3(float p[3], const float v1[3], const float v2[3], const fl } /* weight 3 vectors, - * 'w' must be unit length but is not a vector, just 3 weights */ + * 'w' must be unit length but is not a vector, just 4 weights */ void interp_v3_v3v3v3v3(float p[3], const float v1[3], const float v2[3], const float v3[3], const float v4[3], const float w[4]) { p[0] = v1[0]*w[0] + v2[0]*w[1] + v3[0]*w[2] + v4[0]*w[3]; diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index f382896c868..1b6b489488c 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -517,7 +517,7 @@ void unique_editbone_name (ListBase *edbo, char *name, EditBone *bone) /* Strip off the suffix, if it's a number */ number= strlen(name); if (number && isdigit(name[number-1])) { - dot= strrchr(name, '.'); // last occurrance + dot= strrchr(name, '.'); // last occurrence if (dot) *dot=0; } @@ -5318,7 +5318,7 @@ void unique_bone_name (bArmature *arm, char *name) /* Strip off the suffix, if it's a number */ number= strlen(name); if(number && isdigit(name[number-1])) { - dot= strrchr(name, '.'); // last occurrance + dot= strrchr(name, '.'); // last occurrence if (dot) *dot=0; } diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index 575f298b3cd..b5d656bc2b6 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -1008,7 +1008,7 @@ static void widget_draw_text_icon(uiFontStyle *fstyle, uiWidgetColors *wcol, uiB } /* If there's an icon too (made with uiDefIconTextBut) then draw the icon - and offset the text label to accomodate it */ + and offset the text label to accommodate it */ if (but->flag & UI_HAS_ICON) { widget_draw_icon(but, but->icon+but->iconadd, 1.0f, rect); diff --git a/source/blender/editors/mesh/editmesh_add.c b/source/blender/editors/mesh/editmesh_add.c index 3a80d7c69bb..d6b4b43c569 100644 --- a/source/blender/editors/mesh/editmesh_add.c +++ b/source/blender/editors/mesh/editmesh_add.c @@ -484,7 +484,7 @@ static int compareface_overlaps(EditFace *vl1, EditFace *vl2) return 0; } -/* checks for existance, and for tria overlapping inside quad */ +/* checks for existence, and for tria overlapping inside quad */ static EditFace *exist_face_overlaps(EditMesh *em, EditVert *v1, EditVert *v2, EditVert *v3, EditVert *v4) { EditFace *efa, efatest; diff --git a/source/blender/editors/mesh/editmesh_lib.c b/source/blender/editors/mesh/editmesh_lib.c index d99765bd199..69043d9fa98 100644 --- a/source/blender/editors/mesh/editmesh_lib.c +++ b/source/blender/editors/mesh/editmesh_lib.c @@ -1975,7 +1975,7 @@ int compareface(EditFace *vl1, EditFace *vl2) return 0; } -/* checks for existance, not tria overlapping inside quad */ +/* checks for existence, not tria overlapping inside quad */ EditFace *exist_face(EditMesh *em, EditVert *v1, EditVert *v2, EditVert *v3, EditVert *v4) { EditFace *efa, efatest; diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c index becad003d5c..b3a160dfff4 100644 --- a/source/blender/editors/object/object_select.c +++ b/source/blender/editors/object/object_select.c @@ -786,7 +786,7 @@ void object_flip_name (char *name) /* We first check the case with a .### extension, let's find the last period */ if(isdigit(name[len-1])) { - index= strrchr(name, '.'); // last occurrance + index= strrchr(name, '.'); // last occurrence if (index && isdigit(index[1]) ) { // doesnt handle case bone.1abc2 correct..., whatever! strcpy(number, index); *index= 0; diff --git a/source/blender/imbuf/intern/jpeg.c b/source/blender/imbuf/intern/jpeg.c index 2b2d17784e2..97d700f3af7 100644 --- a/source/blender/imbuf/intern/jpeg.c +++ b/source/blender/imbuf/intern/jpeg.c @@ -64,7 +64,7 @@ static ImBuf * ibJpegImageFromCinfo(struct jpeg_decompress_struct * cinfo, int f type 3 is unsupported as of jul 05 2000 Frank. - * 3. jstr - as 2, but written in 2 seperate fields + * 3. jstr - as 2, but written in 2 separate fields * 4. jmax - no scaling in the components */ diff --git a/source/blender/imbuf/intern/radiance_hdr.c b/source/blender/imbuf/intern/radiance_hdr.c index 5acde1232fd..ac62872479b 100644 --- a/source/blender/imbuf/intern/radiance_hdr.c +++ b/source/blender/imbuf/intern/radiance_hdr.c @@ -283,7 +283,7 @@ static int fwritecolrs(FILE* file, int width, int channels, unsigned char* ibufs putc(2, file); putc((unsigned char)(width >> 8), file); putc((unsigned char)(width & 255), file); - /* put components seperately */ + /* put components separately */ for (i=0;i<4;i++) { for (j=0;j<width;j+=cnt) { /* find next run */ for (beg=j;beg<width;beg+=cnt) { diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c index 0eb4f9b9da0..852c9107dd3 100644 --- a/source/blender/makesrna/intern/rna_object_force.c +++ b/source/blender/makesrna/intern/rna_object_force.c @@ -1312,7 +1312,7 @@ static void rna_def_field(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Amplitude", "The amplitude of the offset"); RNA_def_property_update(prop, 0, "rna_FieldSettings_update"); - /* Variables used for Curve Guide, allready wrapped, used for other fields too */ + /* Variables used for Curve Guide, already wrapped, used for other fields too */ // falloff_power, use_max_distance, maximum_distance } diff --git a/source/blender/python/generic/vector.c b/source/blender/python/generic/vector.c index 0713d60c6c2..653f482f724 100644 --- a/source/blender/python/generic/vector.c +++ b/source/blender/python/generic/vector.c @@ -1287,7 +1287,7 @@ static PyObject *Vector_getSwizzle(VectorObject * self, void *closure) the destination is effectively re-ordered as defined by the swizzle. At most min(len(source), len(dest)) values will be copied. - If the value is scalar, it is copied to all axes listed in the swizzle. - - If an axis appears more than once in the swizzle, the final occurrance is + - If an axis appears more than once in the swizzle, the final occurrence is the one that determines its value. Returns 0 on success and -1 on failure. On failure, the vector will be diff --git a/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp b/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp index 05513d85fc6..e58beea4984 100644 --- a/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp +++ b/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp @@ -443,7 +443,7 @@ static PyObject* gPyCreateConstraint(PyObject* self, PHY_IPhysicsController* physctrl = (PHY_IPhysicsController*) physicsid; PHY_IPhysicsController* physctrl2 = (PHY_IPhysicsController*) physicsid2; - if (physctrl) //TODO:check for existance of this pointer! + if (physctrl) //TODO:check for existence of this pointer! { PHY_ConstraintType ct = (PHY_ConstraintType) constrainttype; int constraintid =0; |