[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50702] trunk/blender/source/blender: code cleanup: typos and set exceptional cases of zero length normals as UNLIKELY().
Campbell Barton
ideasman42 at gmail.com
Tue Sep 18 00:22:07 CEST 2012
Revision: 50702
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50702
Author: campbellbarton
Date: 2012-09-17 22:22:06 +0000 (Mon, 17 Sep 2012)
Log Message:
-----------
code cleanup: typos and set exceptional cases of zero length normals as UNLIKELY().
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/mesh.c
trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c
trunk/blender/source/blender/bmesh/intern/bmesh_operators.c
trunk/blender/source/blender/modifiers/intern/MOD_screw.c
Modified: trunk/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh.c 2012-09-17 22:19:50 UTC (rev 50701)
+++ trunk/blender/source/blender/blenkernel/intern/mesh.c 2012-09-17 22:22:06 UTC (rev 50702)
@@ -1944,8 +1944,9 @@
MVert *mv = &mverts[i];
float *no = tnorms[i];
- if (normalize_v3(no) == 0.0f)
+ if (UNLIKELY(normalize_v3(no) == 0.0f)) {
normalize_v3_v3(no, mv->co);
+ }
normal_float_to_short_v3(mv->no, no);
}
@@ -1981,8 +1982,9 @@
MVert *mv = &mverts[i];
float *no = tnorms[i];
- if (normalize_v3(no) == 0.0f)
+ if (UNLIKELY(normalize_v3(no) == 0.0f)) {
normalize_v3_v3(no, mv->co);
+ }
normal_float_to_short_v3(mv->no, no);
}
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c 2012-09-17 22:19:50 UTC (rev 50701)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c 2012-09-17 22:22:06 UTC (rev 50702)
@@ -282,7 +282,7 @@
if (skip_hidden && BM_elem_flag_test(v, BM_ELEM_HIDDEN))
continue;
- if (normalize_v3(v->no) == 0.0f) {
+ if (UNLIKELY(normalize_v3(v->no) == 0.0f)) {
normalize_v3_v3(v->no, v->co);
}
}
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_operators.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_operators.c 2012-09-17 22:19:50 UTC (rev 50701)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_operators.c 2012-09-17 22:22:06 UTC (rev 50702)
@@ -1253,7 +1253,7 @@
return bm->errorstack.first != NULL;
}
-/* returns error code or 0 if no erro */
+/* returns error code or 0 if no error */
int BMO_error_get(BMesh *bm, const char **msg, BMOperator **op)
{
BMOpError *err = bm->errorstack.first;
Modified: trunk/blender/source/blender/modifiers/intern/MOD_screw.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_screw.c 2012-09-17 22:19:50 UTC (rev 50701)
+++ trunk/blender/source/blender/modifiers/intern/MOD_screw.c 2012-09-17 22:22:06 UTC (rev 50702)
@@ -393,7 +393,7 @@
mul_m4_v3(mtx_tx, vc->co);
/* length in 2d, don't sqrt because this is only for comparison */
- vc->dist = vc->co[other_axis_1] * vc->co[other_axis_1] +
+ vc->dist = vc->co[other_axis_1] * vc->co[other_axis_1] +
vc->co[other_axis_2] * vc->co[other_axis_2];
/* printf("location %f %f %f -- %f\n", vc->co[0], vc->co[1], vc->co[2], vc->dist);*/
@@ -410,7 +410,7 @@
vc->v[0] = vc->v[1] = -1;
/* length in 2d, don't sqrt because this is only for comparison */
- vc->dist = vc->co[other_axis_1] * vc->co[other_axis_1] +
+ vc->dist = vc->co[other_axis_1] * vc->co[other_axis_1] +
vc->co[other_axis_2] * vc->co[other_axis_2];
/* printf("location %f %f %f -- %f\n", vc->co[0], vc->co[1], vc->co[2], vc->dist);*/
@@ -430,7 +430,7 @@
vc->e[1] = med_new;
}
else {
- vc->v[0] = vc->v[1] = -2; /* erro value - don't use, 3 edges on vert */
+ vc->v[0] = vc->v[1] = -2; /* error value - don't use, 3 edges on vert */
}
vc = &vert_connect[med_new->v2];
@@ -445,7 +445,7 @@
vc->e[1] = med_new;
}
else {
- vc->v[0] = vc->v[1] = -2; /* erro value - don't use, 3 edges on vert */
+ vc->v[0] = vc->v[1] = -2; /* error value - don't use, 3 edges on vert */
}
}
More information about the Bf-blender-cvs
mailing list