Revision: 50196
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50196
Author: campbellbarton
Date: 2012-08-24 23:22:34 +0000 (Fri, 24 Aug 2012)
Log Message:
-----------
style cleanup: also spelling
Modified Paths:
--------------
trunk/blender/extern/recastnavigation/Recast/Source/RecastFilter.cpp
trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
trunk/blender/source/blender/blenkernel/intern/anim.c
trunk/blender/source/blender/blenkernel/intern/armature.c
trunk/blender/source/blender/blenkernel/intern/curve.c
trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
trunk/blender/source/blender/blenkernel/intern/fcurve.c
trunk/blender/source/blender/blenkernel/intern/material.c
trunk/blender/source/blender/blenkernel/intern/nla.c
trunk/blender/source/blender/blenkernel/intern/node.c
trunk/blender/source/blender/bmesh/intern/bmesh_opdefines.c
trunk/blender/source/blender/editors/animation/fmodifier_ui.c
trunk/blender/source/blender/editors/gpencil/gpencil_paint.c
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/render/render_internal.c
trunk/blender/source/blender/editors/uvedit/uvedit_parametrizer.c
trunk/blender/source/gameengine/SceneGraph/SG_ParentRelation.h
Modified: trunk/blender/extern/recastnavigation/Recast/Source/RecastFilter.cpp
===================================================================
--- trunk/blender/extern/recastnavigation/Recast/Source/RecastFilter.cpp
2012-08-24 17:58:49 UTC (rev 50195)
+++ trunk/blender/extern/recastnavigation/Recast/Source/RecastFilter.cpp
2012-08-24 23:22:34 UTC (rev 50196)
@@ -128,7 +128,7 @@
rcSpan* ns = solid.spans[dx + dy*w];
int nbot = -walkableClimb;
int ntop = ns ? (int)ns->smin :
MAX_HEIGHT;
- // Skip neightbour if the gap between
the spans is too small.
+ // Skip neighbor if the gap between the
spans is too small.
if (rcMin(top,ntop) - rcMax(bot,nbot) >
walkableHeight)
minh = rcMin(minh, nbot - bot);
@@ -137,7 +137,7 @@
{
nbot = (int)ns->smax;
ntop = ns->next ?
(int)ns->next->smin : MAX_HEIGHT;
- // Skip neightbour if the gap
between the spans is too small.
+ // Skip neighbor if the gap
between the spans is too small.
if (rcMin(top,ntop) -
rcMax(bot,nbot) > walkableHeight)
{
minh = rcMin(minh, nbot
- bot);
Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
2012-08-24 17:58:49 UTC (rev 50195)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
2012-08-24 23:22:34 UTC (rev 50196)
@@ -541,7 +541,7 @@
CustomData_free(&me->pdata, me->totpoly);
/* ok, this should now use new CD shapekey data,
- * which shouuld be fed through the modifier
+ * which should be fed through the modifier
* stack*/
if (tmp.totvert != me->totvert && !did_shapekeys && me->key) {
printf("%s: YEEK! this should be recoded! Shape key loss!: ID
'%s'\n", __func__, tmp.id.name);
@@ -1793,7 +1793,7 @@
{
finaldm->recalcTessellation(finaldm);
}
- /* Even if tessellation is not needed, some modifiers migh have
modified CD layers
+ /* Even if tessellation is not needed, some modifiers might
have modified CD layers
* (like mloopcol or mloopuv), hence we have to update those. */
else if (finaldm->dirty & DM_DIRTY_TESS_CDLAYERS) {
/* A tessellation already exists, it should always have
a CD_POLYINDEX. */
Modified: trunk/blender/source/blender/blenkernel/intern/anim.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim.c 2012-08-24
17:58:49 UTC (rev 50195)
+++ trunk/blender/source/blender/blenkernel/intern/anim.c 2012-08-24
23:22:34 UTC (rev 50196)
@@ -282,7 +282,7 @@
/* ........ */
-/* Note on evaluation optimisations:
+/* Note on evaluation optimizations:
* Optimisations currently used here play tricks with the depsgraph in order
to try and
* evaluate as few objects as strictly necessary to get nicer performance
under standard
* production conditions. For those people who really need the accurate
version,
@@ -323,7 +323,7 @@
/* update scene for current frame */
static void motionpaths_calc_update_scene(Scene *scene)
{
-#if 1 // 'production' optimisations always on
+#if 1 // 'production' optimizations always on
Base *base, *last = NULL;
/* only stuff that moves or needs display still */
@@ -431,7 +431,7 @@
if (efra <= sfra) return;
/* optimize the depsgraph for faster updates */
- /* TODO: whether this is used should depend on some setting for the
level of optimisations used */
+ /* TODO: whether this is used should depend on some setting for the
level of optimizations used */
motionpaths_calc_optimise_depsgraph(scene, targets);
/* calculate path over requested range */
Modified: trunk/blender/source/blender/blenkernel/intern/armature.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/armature.c 2012-08-24
17:58:49 UTC (rev 50195)
+++ trunk/blender/source/blender/blenkernel/intern/armature.c 2012-08-24
23:22:34 UTC (rev 50196)
@@ -1463,7 +1463,7 @@
*
* was 0.0000000000001, caused bug [#31333], smaller values give
unstable
* roll when toggling editmode again...
- * No good value here, trying 0.000000001 as best compromize. :/
+ * No good value here, trying 0.000000001 as best compromise. :/
*/
if (dot_v3v3(axis, axis) > 1.0e-9f) {
/* if nor is *not* a multiple of target ... */
Modified: trunk/blender/source/blender/blenkernel/intern/curve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/curve.c 2012-08-24
17:58:49 UTC (rev 50195)
+++ trunk/blender/source/blender/blenkernel/intern/curve.c 2012-08-24
23:22:34 UTC (rev 50196)
@@ -1165,7 +1165,7 @@
static void forward_diff_bezier_cotangent(const float p0[3], const float
p1[3], const float p2[3], const float p3[3],
float p[3], int it, int stride)
{
- /* note that these are not purpendicular to the curve
+ /* note that these are not perpendicular to the curve
* they need to be rotated for this,
*
* This could also be optimized like BKE_curve_forward_diff_bezier */
Modified: trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
2012-08-24 17:58:49 UTC (rev 50195)
+++ trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
2012-08-24 23:22:34 UTC (rev 50196)
@@ -3996,7 +3996,7 @@
float force_intersect;
float temp;
- /* project force vector on the plane determined by these two
neightbour points
+ /* project force vector on the plane determined by these two
neighbor points
* and calculate relative force angle from it*/
cross_v3_v3v3(tangent, bNeighs[closest_id[0]].dir,
bNeighs[closest_id[1]].dir);
normalize_v3(tangent);
Modified: trunk/blender/source/blender/blenkernel/intern/fcurve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/fcurve.c 2012-08-24
17:58:49 UTC (rev 50195)
+++ trunk/blender/source/blender/blenkernel/intern/fcurve.c 2012-08-24
23:22:34 UTC (rev 50196)
@@ -365,7 +365,7 @@
/* initialize replace-flag first */
*replace = 0;
- /* sneaky optimisations (don't go through searching process if...):
+ /* sneaky optimizations (don't go through searching process if...):
* - keyframe to be added is to be added out of current bounds
* - keyframe to be added would replace one of the existing ones
on bounds
*/
Modified: trunk/blender/source/blender/blenkernel/intern/material.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/material.c 2012-08-24
17:58:49 UTC (rev 50195)
+++ trunk/blender/source/blender/blenkernel/intern/material.c 2012-08-24
23:22:34 UTC (rev 50196)
@@ -813,7 +813,7 @@
*totcolp = act;
}
- // Determine the object/mesh linking
+ /* Determine the object/mesh linking */
if (assign_type == BKE_MAT_ASSIGN_USERPREF && ob->totcol && ob->actcol)
{
/* copy from previous material */
bit = ob->matbits[ob->actcol - 1];
@@ -1633,7 +1633,7 @@
/* flag is shifted in 1 to make 0 != no flag yet (see encode_tfaceflag)
*/
flag -= 1;
- alphablend = flag >> 15; //encoded in the encode_tfaceflag function
+ alphablend = flag >> 15; /* encoded in the encode_tfaceflag function */
(*game).flag = 0;
/* General Material Options */
@@ -2033,8 +2033,7 @@
nowarning = 0;
}
else
- convert_tfacematerial(main, ma);
- continue;
+ convert_tfacematerial(main, ma);
continue;
}
/* no conflicts in this material - 90% of cases
Modified: trunk/blender/source/blender/blenkernel/intern/nla.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/nla.c 2012-08-24
17:58:49 UTC (rev 50195)
+++ trunk/blender/source/blender/blenkernel/intern/nla.c 2012-08-24
23:22:34 UTC (rev 50196)
@@ -764,7 +764,7 @@
}
/* Add the given NLA-Strip to the given Meta-Strip, assuming that the
- * strip isn't attached to anyy list of strips
+ * strip isn't attached to any list of strips
*/
short BKE_nlameta_add_strip(NlaStrip *mstrip, NlaStrip *strip)
{
Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c 2012-08-24
17:58:49 UTC (rev 50195)
+++ trunk/blender/source/blender/blenkernel/intern/node.c 2012-08-24
23:22:34 UTC (rev 50196)
@@ -1484,7 +1484,7 @@
* otherwise we may reference missing data.
*
* Currently its only used for ID's, but nodes may one day
- * referene other pointers which need validation.
+ * reference other pointers which need validation.
*/
typedef struct bNodeClipboardExtraInfo {
struct bNodeClipboardExtraInfo *next, *prev;
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_opdefines.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_opdefines.c 2012-08-24
17:58:49 UTC (rev 50195)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_opdefines.c 2012-08-24
23:22:34 UTC (rev 50196)
@@ -366,8 +366,8 @@
*/
static BMOpDefine bmo_create_vert_def = {
"create_vert",
- {{BMO_OP_SLOT_VEC, "co"}, //the coordinate of the new vert
- {BMO_OP_SLOT_ELEMENT_BUF, "newvertout"}, //the new vert
+ {{BMO_OP_SLOT_VEC, "co"}, /* the coordinate of the new vert */
+ {BMO_OP_SLOT_ELEMENT_BUF, "newvertout"}, /* the new vert */
{0, /* null-terminating sentinel */}},
bmo_create_vert_exec,
0,
@@ -381,8 +381,8 @@
*/
static BMOpDefine bmo_join_triangles_def = {
"join_triangles",
- {{BMO_OP_SLOT_ELEMENT_BUF, "faces"}, //input geometry.
- {BMO_OP_SLOT_ELEMENT_BUF, "faceout"}, //joined faces
+ {{BMO_OP_SLOT_ELEMENT_BUF, "faces"}, /* input geometry. */
+ {BMO_OP_SLOT_ELEMENT_BUF, "faceout"}, /* joined faces */
{BMO_OP_SLOT_BOOL, "cmp_sharp"},
{BMO_OP_SLOT_BOOL, "cmp_uvs"},
{BMO_OP_SLOT_BOOL, "cmp_vcols"},
@@ -406,7 +406,7 @@
*/
static BMOpDefine bmo_contextual_create_def = {
"contextual_create",
- {{BMO_OP_SLOT_ELEMENT_BUF, "geom"}, //input geometry.
+ {{BMO_OP_SLOT_ELEMENT_BUF, "geom"}, /* input geometry. */
{BMO_OP_SLOT_ELEMENT_BUF, "faceout"}, /* newly-made face(s) */
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
