Commit: 13a8f650df5eeea7974dad8db04f52e9d30d9026
Author: Campbell Barton
Date: Mon Jul 21 10:53:07 2014 +1000
Branches: master
https://developer.blender.org/rB13a8f650df5eeea7974dad8db04f52e9d30d9026
Cleanup
===================================================================
M source/blender/bmesh/intern/bmesh_walkers.c
M source/blender/bmesh/tools/bmesh_bevel.c
M source/blender/editors/screen/screen_edit.c
M source/blender/editors/uvedit/uvedit_draw.c
M source/blender/windowmanager/intern/wm_operators.c
M source/blender/windowmanager/intern/wm_subwindow.c
M source/gameengine/Ketsji/KX_MouseFocusSensor.h
===================================================================
diff --git a/source/blender/bmesh/intern/bmesh_walkers.c
b/source/blender/bmesh/intern/bmesh_walkers.c
index 8f74e98..6a5efbe 100644
--- a/source/blender/bmesh/intern/bmesh_walkers.c
+++ b/source/blender/bmesh/intern/bmesh_walkers.c
@@ -47,7 +47,7 @@
*
* basic design pattern: the walker step function goes through it's
* list of possible choices for recursion, and recurses (by pushing a new
state)
- * using the first non-visited one. this choise is the flagged as visited
using
+ * using the first non-visited one. This choice is the flagged as visited
using
* the ghash. each step may push multiple new states onto the worklist at
once.
*
* - Walkers use tool flags, not header flags.
diff --git a/source/blender/bmesh/tools/bmesh_bevel.c
b/source/blender/bmesh/tools/bmesh_bevel.c
index bd7378f..aedc551 100644
--- a/source/blender/bmesh/tools/bmesh_bevel.c
+++ b/source/blender/bmesh/tools/bmesh_bevel.c
@@ -1631,7 +1631,7 @@ static void build_boundary(BevelParams *bp, BevVert *bv,
bool construct)
* corresponding ones that changed on the other end.
* The graph is dynamic in the sense that having an offset that
* doesn't meet the user spec can be added as the search proceeds.
- * We want this search to be deterministic (not dependendent
+ * We want this search to be deterministic (not dependent
* on order of processing through hash table), so as to avoid
* flicker to to different decisions made if search is different
* while dragging the offset number in the UI. So look for the
@@ -3387,7 +3387,7 @@ static void bevel_build_edge_polygons(BMesh *bm,
BevelParams *bp, BMEdge *bme)
VMesh *vm1, *vm2;
EdgeHalf *e1, *e2;
BMEdge *bme1, *bme2;
- BMFace *f1, *f2, *f, *newf;
+ BMFace *f1, *f2, *f;
int k, nseg, i1, i2, odd, mid;
int mat_nr = bp->mat_nr;
@@ -3428,7 +3428,7 @@ static void bevel_build_edge_polygons(BMesh *bm,
BevelParams *bp, BMEdge *bme)
vm2 = bv2->vmesh;
if (nseg == 1) {
- newf = bev_create_quad_straddle(bm, bmv1, bmv2, bmv3, bmv4, f1,
f2, mat_nr, e1->is_seam);
+ bev_create_quad_straddle(bm, bmv1, bmv2, bmv3, bmv4, f1, f2,
mat_nr, e1->is_seam);
}
else {
bmv1i = bmv1;
diff --git a/source/blender/editors/screen/screen_edit.c
b/source/blender/editors/screen/screen_edit.c
index f76f76a..5beab9f 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@ -378,7 +378,7 @@ ScrArea *area_split(bScreen *sc, ScrArea *sa, char dir,
float fac, int merge)
if (split == 0) return NULL;
/* note regarding (fac > 0.5f) checks below.
- * notmally it shouldn't matter which is used since the copy should
match the original
+ * normally it shouldn't matter which is used since the copy should
match the original
* however with viewport rendering and python console this isn't the
case. - campbell */
if (dir == 'h') {
diff --git a/source/blender/editors/uvedit/uvedit_draw.c
b/source/blender/editors/uvedit/uvedit_draw.c
index 177b442..386c9bb 100644
--- a/source/blender/editors/uvedit/uvedit_draw.c
+++ b/source/blender/editors/uvedit/uvedit_draw.c
@@ -420,7 +420,7 @@ static void draw_uvs_other_mesh_new_shading(Object *ob,
const Image *curimage)
Image *image;
/* if no materials, assume a default material with no image */
- if(ob->totcol)
+ if (ob->totcol)
ED_object_get_active_image(ob, a + 1, &image, NULL,
NULL);
else
image = NULL;
diff --git a/source/blender/windowmanager/intern/wm_operators.c
b/source/blender/windowmanager/intern/wm_operators.c
index 38335b5..03cec49 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -501,7 +501,7 @@ void WM_operator_py_idname(char *to, const char *from)
int ofs = (sep - from);
/* note, we use ascii tolower instead of system tolower,
because the
- * latter depends on the locale, and can lead to idname
mistmatch */
+ * latter depends on the locale, and can lead to idname
mismatch */
memcpy(to, from, sizeof(char) * ofs);
BLI_ascii_strtolower(to, ofs);
diff --git a/source/blender/windowmanager/intern/wm_subwindow.c
b/source/blender/windowmanager/intern/wm_subwindow.c
index 1792ea4..db4459b 100644
--- a/source/blender/windowmanager/intern/wm_subwindow.c
+++ b/source/blender/windowmanager/intern/wm_subwindow.c
@@ -308,7 +308,7 @@ void wmSubWindowScissorSet(wmWindow *win, int swinid, const
rcti *srct, bool src
int scissor_height = BLI_rcti_size_y(srct);
/* typically a single pixel doesn't matter,
- * but one pixel offset is noticable with viewport border
render */
+ * but one pixel offset is noticeable with viewport border
render */
if (srct_pad) {
scissor_width += 1;
scissor_height += 1;
diff --git a/source/gameengine/Ketsji/KX_MouseFocusSensor.h
b/source/gameengine/Ketsji/KX_MouseFocusSensor.h
index 903c3c0..0c7c8ab 100644
--- a/source/gameengine/Ketsji/KX_MouseFocusSensor.h
+++ b/source/gameengine/Ketsji/KX_MouseFocusSensor.h
@@ -137,7 +137,7 @@ class KX_MouseFocusSensor : public SCA_MouseSensor
bool m_bTouchPulse;
/**
- * Flags get trought other objects
+ * Flags get through other objects
*/
bool m_bXRay;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
