diff options
author | Thomas Dinges <blender@dingto.org> | 2013-04-07 19:09:06 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2013-04-07 19:09:06 +0400 |
commit | 858ff6b69626bf8385debe06436b2f2abba56f45 (patch) | |
tree | f32c8f31043e57a0f64afd80d98ba06fbd8c51cc | |
parent | c0ab8a15c344afdc513513444f0969766ea50db9 (diff) |
Fix for [#34898] Typo in error message of mathutils.Vector
* Also fixed some more cases of "more then" -> "more than".
28 files changed, 34 insertions, 34 deletions
diff --git a/release/scripts/modules/addon_utils.py b/release/scripts/modules/addon_utils.py index 02115054396..0a65701cac5 100644 --- a/release/scripts/modules/addon_utils.py +++ b/release/scripts/modules/addon_utils.py @@ -331,7 +331,7 @@ def disable(module_name, default_set=True): print("addon_utils.disable: %s not %s." % (module_name, "disabled" if mod is None else "loaded")) - # could be in more then once, unlikely but better do this just in case. + # could be in more than once, unlikely but better do this just in case. addons = _user_preferences.addons if default_set: diff --git a/release/scripts/startup/bl_operators/image.py b/release/scripts/startup/bl_operators/image.py index ce328b86eac..0d3d45d98fe 100644 --- a/release/scripts/startup/bl_operators/image.py +++ b/release/scripts/startup/bl_operators/image.py @@ -133,7 +133,7 @@ class SaveDirty(Operator): self.report({'WARNING'}, "Invalid path: " + filepath) elif filepath in unique_paths: self.report({'WARNING'}, - "Path used by more then one image: %r" % + "Path used by more than one image: %r" % filepath) else: unique_paths.add(filepath) diff --git a/release/scripts/startup/bl_operators/uvcalc_smart_project.py b/release/scripts/startup/bl_operators/uvcalc_smart_project.py index 160ca5c6977..42170ff3e36 100644 --- a/release/scripts/startup/bl_operators/uvcalc_smart_project.py +++ b/release/scripts/startup/bl_operators/uvcalc_smart_project.py @@ -140,7 +140,7 @@ def island2Edge(island): else: i1= vIdx; i2= vIdx-1 - try: edges[ f_uvkey[i1], f_uvkey[i2] ] *= 0 # sets any edge with more then 1 user to 0 are not returned. + try: edges[ f_uvkey[i1], f_uvkey[i2] ] *= 0 # sets any edge with more than 1 user to 0 are not returned. except: edges[ f_uvkey[i1], f_uvkey[i2] ] = (f.uv[i1] - f.uv[i2]).length, # If 2 are the same then they will be together, but full [a,b] order is not correct. diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c index b93d924ddf9..19c98eb5139 100644 --- a/source/blender/blenkernel/intern/mball.c +++ b/source/blender/blenkernel/intern/mball.c @@ -2180,7 +2180,7 @@ static void free_metaball_octal_node(octal_node *node) MEM_freeN(node); } -/* If scene include more then one MetaElem, then octree is used */ +/* If scene include more than one MetaElem, then octree is used */ static void init_metaball_octal_tree(int depth) { struct octal_node *node; @@ -2269,7 +2269,7 @@ void BKE_mball_polygonize(Scene *scene, Object *ob, ListBase *dispbase) G_mb.metaball_tree = NULL; } - /* if scene includes more then one MetaElem, then octal tree optimization is used */ + /* if scene includes more than one MetaElem, then octal tree optimization is used */ if ((G_mb.totelem > 1) && (G_mb.totelem <= 64)) init_metaball_octal_tree(1); if ((G_mb.totelem > 64) && (G_mb.totelem <= 128)) init_metaball_octal_tree(2); if ((G_mb.totelem > 128) && (G_mb.totelem <= 512)) init_metaball_octal_tree(3); diff --git a/source/blender/blenkernel/intern/mesh_validate.c b/source/blender/blenkernel/intern/mesh_validate.c index 90704cb8b7e..3f118129dac 100644 --- a/source/blender/blenkernel/intern/mesh_validate.c +++ b/source/blender/blenkernel/intern/mesh_validate.c @@ -474,7 +474,7 @@ int BKE_mesh_validate_arrays(Mesh *mesh, *v = ml->v; } - /* is the same vertex used more then once */ + /* is the same vertex used more than once */ if (!sp->invalid) { v = sp->verts; for (j = 0; j < mp->totloop; j++, v++) { diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index c119eb07779..b221f85c7fe 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -1388,7 +1388,7 @@ void BKE_ptcache_ids_from_object(ListBase *lb, Object *ob, Scene *scene, int dup /* Takes an Object ID and returns a unique name * - id: object id * - cfra: frame for the cache, can be negative - * - stack_index: index in the modifier stack. we can have cache for more then one stack_index + * - stack_index: index in the modifier stack. we can have cache for more than one stack_index */ #define MAX_PTCACHE_PATH FILE_MAX diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index c2d25ce54db..e03ebc40c86 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -920,7 +920,7 @@ char *BKE_scene_find_marker_name(Scene *scene, int frame) } /* return the current marker for this frame, - * we can have more then 1 marker per frame, this just returns the first :/ */ + * we can have more than 1 marker per frame, this just returns the first :/ */ char *BKE_scene_find_last_marker_name(Scene *scene, int frame) { TimeMarker *marker, *best_marker = NULL; diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c index 842f495dffe..9b019776508 100644 --- a/source/blender/blenkernel/intern/text.c +++ b/source/blender/blenkernel/intern/text.c @@ -2744,7 +2744,7 @@ void txt_comment(Text *text) if (!text) return; if (!text->curl) return; - if (!text->sell) return; // Need to change this need to check if only one line is selected to more then one + if (!text->sell) return; // Need to change this need to check if only one line is selected to more than one num = 0; while (TRUE) { diff --git a/source/blender/blenlib/BLI_array.h b/source/blender/blenlib/BLI_array.h index 0ba0f138c28..95a5c7499c7 100644 --- a/source/blender/blenlib/BLI_array.h +++ b/source/blender/blenlib/BLI_array.h @@ -81,7 +81,7 @@ void _bli_array_grow_func(void **arr_p, const void *arr_static, /* Grow the array by a fixed number of items. * - * Allow for a large 'num' value when the new size is more then double + * Allow for a large 'num' value when the new size is more than double * to allocate the exact sized array. */ #define BLI_array_grow_items(arr, num) (( \ (((void *)(arr) == NULL) && \ diff --git a/source/blender/bmesh/bmesh.h b/source/blender/bmesh/bmesh.h index 3b33513b575..cfd30f29541 100644 --- a/source/blender/bmesh/bmesh.h +++ b/source/blender/bmesh/bmesh.h @@ -80,7 +80,7 @@ * Edges and Vertices in BMesh are much like their counterparts in EditMesh, * except for some members private to the BMesh api. * - * \note There can be more then one edge between two vertices in bmesh, + * \note There can be more than one edge between two vertices in bmesh, * though the rest of blender (e.g. DerivedMesh, CDDM, CCGSubSurf, etc) does not support this. * * diff --git a/source/blender/bmesh/intern/bmesh_construct.c b/source/blender/bmesh/intern/bmesh_construct.c index 5599dd6bc28..a216e762401 100644 --- a/source/blender/bmesh/intern/bmesh_construct.c +++ b/source/blender/bmesh/intern/bmesh_construct.c @@ -221,7 +221,7 @@ BMFace *BM_face_create_ngon(BMesh *bm, BMVert *v1, BMVert *v2, BMEdge **edges, c verts_sort[vsort_index++] = v; edges_sort[esort_index++] = e; - /* we only flag the verts to check if they are in the face more then once */ + /* we only flag the verts to check if they are in the face more than once */ BM_ELEM_API_FLAG_ENABLE(v, _FLAG_MV); do { @@ -281,7 +281,7 @@ BMFace *BM_face_create_ngon(BMesh *bm, BMVert *v1, BMVert *v2, BMEdge **edges, c goto err; } - /* check if vert is in face more then once. if the flag is disabled. we've already visited */ + /* check if vert is in face more than once. if the flag is disabled. we've already visited */ if (UNLIKELY(!BM_ELEM_API_FLAG_TEST(verts_sort[i], _FLAG_MV))) { goto err; } diff --git a/source/blender/bmesh/operators/bmo_dissolve.c b/source/blender/bmesh/operators/bmo_dissolve.c index 13d706d8eed..e2a3cf025aa 100644 --- a/source/blender/bmesh/operators/bmo_dissolve.c +++ b/source/blender/bmesh/operators/bmo_dissolve.c @@ -223,7 +223,7 @@ void bmo_dissolve_edgeloop_exec(BMesh *bm, BMOperator *op) BMO_elem_flag_enable(bm, e->v1, VERT_MARK); BMO_elem_flag_enable(bm, e->v2, VERT_MARK); - /* BMESH_TODO - check on delaying edge removal since we may end up removing more then + /* BMESH_TODO - check on delaying edge removal since we may end up removing more than * one edge, and later reference a removed edge */ f_new = BM_faces_join_pair(bm, fa, fb, e, true); @@ -287,7 +287,7 @@ void bmo_dissolve_edges_exec(BMesh *bm, BMOperator *op) /* join faces */ - /* BMESH_TODO - check on delaying edge removal since we may end up removing more then + /* BMESH_TODO - check on delaying edge removal since we may end up removing more than * one edge, and later reference a removed edge */ f_new = BM_faces_join_pair(bm, fa, fb, e, true); diff --git a/source/blender/bmesh/operators/bmo_inset.c b/source/blender/bmesh/operators/bmo_inset.c index d58894d7a1c..c99e6060a50 100644 --- a/source/blender/bmesh/operators/bmo_inset.c +++ b/source/blender/bmesh/operators/bmo_inset.c @@ -316,7 +316,7 @@ static BMLoop *bm_edge_is_mixed_face_tag(BMLoop *l) l_iter = l; do { if (BM_elem_flag_test(l_iter->f, BM_ELEM_TAG)) { - /* more then one tagged face - bail out early! */ + /* more than one tagged face - bail out early! */ if (tot_tag == 1) { return NULL; } diff --git a/source/blender/bmesh/operators/bmo_subdivide.c b/source/blender/bmesh/operators/bmo_subdivide.c index 32c5385bee6..aaa2914e6ae 100644 --- a/source/blender/bmesh/operators/bmo_subdivide.c +++ b/source/blender/bmesh/operators/bmo_subdivide.c @@ -1034,7 +1034,7 @@ void bmo_subdivide_edges_exec(BMesh *bm, BMOperator *op) bool ok = true; /* Check for special case: [#32500] - * This edge pair could be used by more then one face, + * This edge pair could be used by more than one face, * in this case it used to (2.63), split both faces along the same verts * while it could be calculated which face should do the split, * it's ambiguous, so in this case we're better off to skip them as exceptional cases diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 480c4a83507..34293569bd1 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -1984,7 +1984,7 @@ static double soft_range_round_down(double value, double max) /* note: this could be split up into functions which handle arrays and not */ static void ui_set_but_soft_range(uiBut *but) { - /* ideally we would not limit this but practically, its more then + /* ideally we would not limit this but practically, its more than * enough worst case is very long vectors wont use a smart soft-range * which isn't so bad. */ diff --git a/source/blender/editors/mesh/editmesh_rip.c b/source/blender/editors/mesh/editmesh_rip.c index 23920e7424e..47e08bd5c7e 100644 --- a/source/blender/editors/mesh/editmesh_rip.c +++ b/source/blender/editors/mesh/editmesh_rip.c @@ -185,7 +185,7 @@ static float edbm_rip_edge_side_measure(BMEdge *e, BMLoop *e_l, * - Deselect the edge loop facing away. * * Limitation! - * This currently works very poorly with intersecting edge islands (verts with more then 2 tagged edges) + * This currently works very poorly with intersecting edge islands (verts with more than 2 tagged edges) * This is nice to but for now not essential. * * - campbell. @@ -916,7 +916,7 @@ static int edbm_rip_invoke__edge(bContext *C, wmOperator *op, const wmEvent *eve BMLoop *l_b = l_a->radial_next; /* find the best face to follow, this way the edge won't point away from - * the mouse when there are more then 4 (takes the shortest face fan around) */ + * the mouse when there are more than 4 (takes the shortest face fan around) */ l = (edbm_rip_edge_side_measure(e2, l_a, ar, projectMat, fmval) < edbm_rip_edge_side_measure(e2, l_b, ar, projectMat, fmval)) ? l_a : l_b; diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c index 8fe3eb66c67..9197b9e99da 100644 --- a/source/blender/editors/physics/physics_fluid.c +++ b/source/blender/editors/physics/physics_fluid.c @@ -631,7 +631,7 @@ static int fluid_validate_scene(ReportList *reports, Scene *scene, Object *fsDom } if (channelObjCount >= 255) { - BKE_report(reports, RPT_ERROR, "Cannot bake with more then 256 objects"); + BKE_report(reports, RPT_ERROR, "Cannot bake with more than 256 objects"); return 0; } diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index a2101305b4b..f7a064cad0d 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -319,7 +319,7 @@ typedef struct ProjPixel { PixelStore newColor; PixelPointer pixel; - short image_index; /* if anyone wants to paint onto more then 32768 images they can bite me */ + short image_index; /* if anyone wants to paint onto more than 32768 images they can bite me */ unsigned char bb_cell_index; } ProjPixel; diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 983b479f550..2a6b9cfea9e 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -2912,7 +2912,7 @@ static void draw_viewport_fps(Scene *scene, rcti *rect) } #endif - /* is this more then half a frame behind? */ + /* is this more than half a frame behind? */ if (fps + 0.5f < (float)(FPS)) { UI_ThemeColor(TH_REDALERT); BLI_snprintf(printable, sizeof(printable), IFACE_("fps: %.2f"), fps); diff --git a/source/blender/modifiers/intern/MOD_screw.c b/source/blender/modifiers/intern/MOD_screw.c index e7d62452590..7572ac152cb 100644 --- a/source/blender/modifiers/intern/MOD_screw.c +++ b/source/blender/modifiers/intern/MOD_screw.c @@ -349,7 +349,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, * The new array for vert_connect must be at least sizeof(ScrewVertConnect) * totvert * and the size of our resulting meshes array is sizeof(MVert) * totvert * 3 * so its safe to use the second 2 thrids of MVert the array for vert_connect, - * just make sure ScrewVertConnect struct is no more then twice as big as MVert, + * just make sure ScrewVertConnect struct is no more than twice as big as MVert, * at the moment there is no chance of that being a problem, * unless MVert becomes half its current size. * diff --git a/source/blender/python/bmesh/bmesh_py_utils.c b/source/blender/python/bmesh/bmesh_py_utils.c index 7c0adcfc997..d66cfaedbb6 100644 --- a/source/blender/python/bmesh/bmesh_py_utils.c +++ b/source/blender/python/bmesh/bmesh_py_utils.c @@ -84,7 +84,7 @@ static PyObject *bpy_bm_utils_vert_collapse_edge(PyObject *UNUSED(self), PyObjec if (BM_vert_edge_count(py_vert->v) > 2) { PyErr_SetString(PyExc_ValueError, - "vert_collapse_edge(vert, edge): vert has more then 2 connected edges"); + "vert_collapse_edge(vert, edge): vert has more than 2 connected edges"); return NULL; } @@ -150,7 +150,7 @@ static PyObject *bpy_bm_utils_vert_collapse_faces(PyObject *UNUSED(self), PyObje if (BM_vert_edge_count(py_vert->v) > 2) { PyErr_SetString(PyExc_ValueError, - "vert_collapse_faces(vert, edge): vert has more then 2 connected edges"); + "vert_collapse_faces(vert, edge): vert has more than 2 connected edges"); return NULL; } diff --git a/source/blender/python/intern/bpy_props.c b/source/blender/python/intern/bpy_props.c index eef02285f3c..7cef5e23b65 100644 --- a/source/blender/python/intern/bpy_props.c +++ b/source/blender/python/intern/bpy_props.c @@ -49,7 +49,7 @@ #include "../generic/py_capi_utils.h" -/* initial definition of callback slots we'll probably have more then 1 */ +/* initial definition of callback slots we'll probably have more than 1 */ #define BPY_DATA_CB_SLOT_SIZE 3 #define BPY_DATA_CB_SLOT_UPDATE 0 diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index df66ef92316..48caa40ca9c 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -6440,7 +6440,7 @@ bool pyrna_id_FromPyObject(PyObject *obj, ID **id) void BPY_rna_init(void) { -#ifdef USE_MATHUTILS /* register mathutils callbacks, ok to run more then once. */ +#ifdef USE_MATHUTILS /* register mathutils callbacks, ok to run more than once. */ mathutils_rna_array_cb_index = Mathutils_RegisterCallback(&mathutils_rna_array_cb); mathutils_rna_matrix_cb_index = Mathutils_RegisterCallback(&mathutils_rna_matrix_cb); #endif @@ -7723,7 +7723,7 @@ static PyObject *pyrna_unregister_class(PyObject *UNUSED(self), PyObject *py_cla } /* currently this is fairly limited, we would need to make some way to split up - * pyrna_callback_classmethod_... if we want more then one callback per type */ + * pyrna_callback_classmethod_... if we want more than one callback per type */ typedef struct BPyRNA_CallBack { PyMethodDef py_method; StructRNA *bpy_srna; diff --git a/source/blender/python/mathutils/mathutils_Color.c b/source/blender/python/mathutils/mathutils_Color.c index 4a29e72418b..ae5b381cf59 100644 --- a/source/blender/python/mathutils/mathutils_Color.c +++ b/source/blender/python/mathutils/mathutils_Color.c @@ -61,7 +61,7 @@ static PyObject *Color_new(PyTypeObject *type, PyObject *args, PyObject *kwds) default: PyErr_SetString(PyExc_TypeError, "mathutils.Color(): " - "more then a single arg given"); + "more than a single arg given"); return NULL; } return Color_CreatePyObject(col, Py_NEW, type); diff --git a/source/blender/python/mathutils/mathutils_Quaternion.c b/source/blender/python/mathutils/mathutils_Quaternion.c index c28631e5045..9c14a1632cd 100644 --- a/source/blender/python/mathutils/mathutils_Quaternion.c +++ b/source/blender/python/mathutils/mathutils_Quaternion.c @@ -1089,7 +1089,7 @@ static PyObject *Quaternion_new(PyTypeObject *type, PyObject *args, PyObject *kw angle = angle_wrap_rad(angle); /* clamp because of precision issues */ axis_angle_to_quat(quat, axis, angle); break; - /* PyArg_ParseTuple assures no more then 2 */ + /* PyArg_ParseTuple assures no more than 2 */ } } return Quaternion_CreatePyObject(quat, Py_NEW, type); diff --git a/source/blender/python/mathutils/mathutils_Vector.c b/source/blender/python/mathutils/mathutils_Vector.c index f8159f6f187..27fb5bc66f5 100644 --- a/source/blender/python/mathutils/mathutils_Vector.c +++ b/source/blender/python/mathutils/mathutils_Vector.c @@ -90,7 +90,7 @@ static PyObject *Vector_new(PyTypeObject *type, PyObject *args, PyObject *kwds) default: PyErr_SetString(PyExc_TypeError, "mathutils.Vector(): " - "more then a single arg given"); + "more than a single arg given"); return NULL; } return Vector_CreatePyObject_alloc(vec, size, type); diff --git a/source/gameengine/Ketsji/KX_ObjectActuator.cpp b/source/gameengine/Ketsji/KX_ObjectActuator.cpp index 9d6c8d250c7..2965faba8f4 100644 --- a/source/gameengine/Ketsji/KX_ObjectActuator.cpp +++ b/source/gameengine/Ketsji/KX_ObjectActuator.cpp @@ -539,7 +539,7 @@ int KX_ObjectActuator::pyattr_set_angV(void *self_v, const KX_PYATTRIBUTE_DEF *a void KX_ObjectActuator_Mathutils_Callback_Init(void) { - // register mathutils callbacks, ok to run more then once. + // register mathutils callbacks, ok to run more than once. mathutils_kxobactu_vector_cb_index = Mathutils_RegisterCallback(&mathutils_obactu_vector_cb); } diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp index 06abc755a9a..0bdf08bc25f 100644 --- a/source/gameengine/Ketsji/KX_PythonInit.cpp +++ b/source/gameengine/Ketsji/KX_PythonInit.cpp @@ -1892,7 +1892,7 @@ static struct _inittab bge_internal_modules[] = { PyObject *initGamePlayerPythonScripting(const STR_String& progname, TPythonSecurityLevel level, Main *maggie, int argc, char** argv) { /* Yet another gotcha in the py api - * Cant run PySys_SetArgv more then once because this adds the + * Cant run PySys_SetArgv more than once because this adds the * binary dir to the sys.path each time. * Id have thought python being totally restarted would make this ok but * somehow it remembers the sys.path - Campbell |