[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55885] trunk/blender: Fix for [#34898] Typo in error message of mathutils.Vector
Thomas Dinges
blender at dingto.org
Sun Apr 7 17:09:06 CEST 2013
Revision: 55885
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55885
Author: dingto
Date: 2013-04-07 15:09:06 +0000 (Sun, 07 Apr 2013)
Log Message:
-----------
Fix for [#34898] Typo in error message of mathutils.Vector
* Also fixed some more cases of "more then" -> "more than".
Modified Paths:
--------------
trunk/blender/release/scripts/modules/addon_utils.py
trunk/blender/release/scripts/startup/bl_operators/image.py
trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
trunk/blender/source/blender/blenkernel/intern/mball.c
trunk/blender/source/blender/blenkernel/intern/mesh_validate.c
trunk/blender/source/blender/blenkernel/intern/pointcache.c
trunk/blender/source/blender/blenkernel/intern/scene.c
trunk/blender/source/blender/blenkernel/intern/text.c
trunk/blender/source/blender/blenlib/BLI_array.h
trunk/blender/source/blender/bmesh/bmesh.h
trunk/blender/source/blender/bmesh/intern/bmesh_construct.c
trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c
trunk/blender/source/blender/bmesh/operators/bmo_inset.c
trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c
trunk/blender/source/blender/editors/interface/interface.c
trunk/blender/source/blender/editors/mesh/editmesh_rip.c
trunk/blender/source/blender/editors/physics/physics_fluid.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image_proj.c
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
trunk/blender/source/blender/modifiers/intern/MOD_screw.c
trunk/blender/source/blender/python/bmesh/bmesh_py_utils.c
trunk/blender/source/blender/python/intern/bpy_props.c
trunk/blender/source/blender/python/intern/bpy_rna.c
trunk/blender/source/blender/python/mathutils/mathutils_Color.c
trunk/blender/source/blender/python/mathutils/mathutils_Quaternion.c
trunk/blender/source/blender/python/mathutils/mathutils_Vector.c
trunk/blender/source/gameengine/Ketsji/KX_ObjectActuator.cpp
trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
trunk/blender/source/tools/check_style_c.py
Modified: trunk/blender/release/scripts/modules/addon_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/addon_utils.py 2013-04-07 15:02:34 UTC (rev 55884)
+++ trunk/blender/release/scripts/modules/addon_utils.py 2013-04-07 15:09:06 UTC (rev 55885)
@@ -331,7 +331,7 @@
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:
Modified: trunk/blender/release/scripts/startup/bl_operators/image.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/image.py 2013-04-07 15:02:34 UTC (rev 55884)
+++ trunk/blender/release/scripts/startup/bl_operators/image.py 2013-04-07 15:09:06 UTC (rev 55885)
@@ -133,7 +133,7 @@
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)
Modified: trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py 2013-04-07 15:02:34 UTC (rev 55884)
+++ trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py 2013-04-07 15:09:06 UTC (rev 55885)
@@ -140,7 +140,7 @@
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.
Modified: trunk/blender/source/blender/blenkernel/intern/mball.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mball.c 2013-04-07 15:02:34 UTC (rev 55884)
+++ trunk/blender/source/blender/blenkernel/intern/mball.c 2013-04-07 15:09:06 UTC (rev 55885)
@@ -2180,7 +2180,7 @@
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 @@
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);
Modified: trunk/blender/source/blender/blenkernel/intern/mesh_validate.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh_validate.c 2013-04-07 15:02:34 UTC (rev 55884)
+++ trunk/blender/source/blender/blenkernel/intern/mesh_validate.c 2013-04-07 15:09:06 UTC (rev 55885)
@@ -474,7 +474,7 @@
*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++) {
Modified: trunk/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pointcache.c 2013-04-07 15:02:34 UTC (rev 55884)
+++ trunk/blender/source/blender/blenkernel/intern/pointcache.c 2013-04-07 15:09:06 UTC (rev 55885)
@@ -1388,7 +1388,7 @@
/* 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
Modified: trunk/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/scene.c 2013-04-07 15:02:34 UTC (rev 55884)
+++ trunk/blender/source/blender/blenkernel/intern/scene.c 2013-04-07 15:09:06 UTC (rev 55885)
@@ -920,7 +920,7 @@
}
/* 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;
Modified: trunk/blender/source/blender/blenkernel/intern/text.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/text.c 2013-04-07 15:02:34 UTC (rev 55884)
+++ trunk/blender/source/blender/blenkernel/intern/text.c 2013-04-07 15:09:06 UTC (rev 55885)
@@ -2744,7 +2744,7 @@
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) {
Modified: trunk/blender/source/blender/blenlib/BLI_array.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_array.h 2013-04-07 15:02:34 UTC (rev 55884)
+++ trunk/blender/source/blender/blenlib/BLI_array.h 2013-04-07 15:09:06 UTC (rev 55885)
@@ -81,7 +81,7 @@
/* 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) && \
Modified: trunk/blender/source/blender/bmesh/bmesh.h
===================================================================
--- trunk/blender/source/blender/bmesh/bmesh.h 2013-04-07 15:02:34 UTC (rev 55884)
+++ trunk/blender/source/blender/bmesh/bmesh.h 2013-04-07 15:09:06 UTC (rev 55885)
@@ -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.
*
*
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_construct.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_construct.c 2013-04-07 15:02:34 UTC (rev 55884)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_construct.c 2013-04-07 15:09:06 UTC (rev 55885)
@@ -221,7 +221,7 @@
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 @@
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;
}
Modified: trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c 2013-04-07 15:02:34 UTC (rev 55884)
+++ trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c 2013-04-07 15:09:06 UTC (rev 55885)
@@ -223,7 +223,7 @@
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 @@
/* 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);
Modified: trunk/blender/source/blender/bmesh/operators/bmo_inset.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_inset.c 2013-04-07 15:02:34 UTC (rev 55884)
+++ trunk/blender/source/blender/bmesh/operators/bmo_inset.c 2013-04-07 15:09:06 UTC (rev 55885)
@@ -316,7 +316,7 @@
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;
}
Modified: trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c 2013-04-07 15:02:34 UTC (rev 55884)
+++ trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c 2013-04-07 15:09:06 UTC (rev 55885)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list