[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45471] trunk/blender/source/blender: code cleanup:
Campbell Barton
ideasman42 at gmail.com
Sun Apr 8 09:34:09 CEST 2012
Revision: 45471
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45471
Author: campbellbarton
Date: 2012-04-08 07:34:09 +0000 (Sun, 08 Apr 2012)
Log Message:
-----------
code cleanup:
- remove unused vars
- no need to hard code version number for collada.
- cleanup some typos in comments.
- movieclip_calc_length was passing arg which should be unsigned to BLI_stringdec()
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/movieclip.c
trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c
trunk/blender/source/blender/bmesh/intern/bmesh_private.h
trunk/blender/source/blender/bmesh/intern/bmesh_structure.c
trunk/blender/source/blender/bmesh/operators/bmo_slide.c
trunk/blender/source/blender/collada/DocumentExporter.cpp
trunk/blender/source/blender/editors/mesh/editmesh_slide.c
Modified: trunk/blender/source/blender/blenkernel/intern/movieclip.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/movieclip.c 2012-04-08 02:43:07 UTC (rev 45470)
+++ trunk/blender/source/blender/blenkernel/intern/movieclip.c 2012-04-08 07:34:09 UTC (rev 45471)
@@ -273,7 +273,7 @@
}
else if (clip->source == MCLIP_SRC_SEQUENCE) {
int framenr = 1;
- short numlen;
+ unsigned short numlen;
char name[FILE_MAX], head[FILE_MAX], tail[FILE_MAX];
BLI_stringdec(clip->name, head, tail, &numlen);
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c 2012-04-08 02:43:07 UTC (rev 45470)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c 2012-04-08 07:34:09 UTC (rev 45471)
@@ -235,7 +235,7 @@
* a plane defined by the average
* of its edges cross products
*/
-void compute_poly_plane(float (*verts)[3], int nverts)
+void compute_poly_plane(float (*verts)[3], const int nverts)
{
float avgc[3], norm[3], mag, avgn[3];
@@ -257,15 +257,9 @@
add_v3_v3(avgn, norm);
}
- /* what was this bit for */
- if (is_zero_v3(avgn)) {
- avgn[0] = 0.0f;
- avgn[1] = 0.0f;
+ if (UNLIKELY(normalize_v3(avgn) == 0.0f)) {
avgn[2] = 1.0f;
}
- else {
- normalize_v3(avgn);
- }
for (i = 0; i < nverts; i++) {
v1 = verts[i];
@@ -511,7 +505,7 @@
int w1, w2, w3, w4, w5 /*, re */;
float mv1[2], mv2[2], mv3[2], mv4[2];
- /* now test windin */
+ /* now test winding */
w1 = testedgesidef(v1, v3, v2);
w2 = testedgesidef(v2, v4, v1);
w3 = !testedgesidef(v1, v2, v3);
@@ -607,8 +601,9 @@
return crosses % 2 != 0;
}
-static int goodline(float const (*projectverts)[3], BMFace *f, int v1i,
- int v2i, int v3i, int UNUSED(nvert))
+static int goodline(float const (*projectverts)[3], BMFace *f,
+ int v1i, int v2i, int v3i,
+ int UNUSED(nvert))
{
BMLoop *l_iter;
BMLoop *l_first;
@@ -684,17 +679,20 @@
l_iter = l_first = BM_FACE_FIRST_LOOP(f);
do {
- isear = 1;
+ isear = TRUE;
v1 = l_iter->prev->v;
v2 = l_iter->v;
v3 = l_iter->next->v;
if (BM_edge_exists(v1, v3)) {
- isear = 0;
+ isear = FALSE;
}
- else if (!goodline((float const (*)[3])verts, f, BM_elem_index_get(v1), BM_elem_index_get(v2), BM_elem_index_get(v3), nvert)) {
- isear = 0;
+ else if (!goodline((float const (*)[3])verts, f,
+ BM_elem_index_get(v1), BM_elem_index_get(v2), BM_elem_index_get(v3),
+ nvert))
+ {
+ isear = FALSE;
}
if (isear) {
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_private.h
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_private.h 2012-04-08 02:43:07 UTC (rev 45470)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_private.h 2012-04-08 07:34:09 UTC (rev 45471)
@@ -65,7 +65,7 @@
#define BM_ELEM_API_FLAG_DISABLE(element, f) ((element)->oflags[0].pflag &= ~(f))
#define BM_ELEM_API_FLAG_TEST(element, f) ((element)->oflags[0].pflag & (f))
-void compute_poly_plane(float (*verts)[3], int nverts);
+void compute_poly_plane(float (*verts)[3], const int nverts);
void poly_rotate_plane(const float normal[3], float (*verts)[3], const int nverts);
/* include the rest of our private declarations */
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_structure.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_structure.c 2012-04-08 02:43:07 UTC (rev 45470)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_structure.c 2012-04-08 07:34:09 UTC (rev 45471)
@@ -83,7 +83,7 @@
* (this is somewhat outdate, though bits of its API are still used) - joeedh
*
* Cycles are circular doubly linked lists that form the basis of adjacency
- * information in the BME modeller. Full adjacency relations can be derived
+ * information in the BME modeler. Full adjacency relations can be derived
* from examining these cycles very quickly. Although each cycle is a double
* circular linked list, each one is considered to have a 'base' or 'head',
* and care must be taken by Euler code when modifying the contents of a cycle.
@@ -100,7 +100,7 @@
* Base: vertex->edge pointer.
*
* This cycle is the most complicated in terms of its structure. Each bmesh_Edge contains
- * two bmesh_CycleNode structures to keep track of that edge's membership in the disk cycle
+ * two bmesh_CycleNode structures to keep track of that edges membership in the disk cycle
* of each of its vertices. However for any given vertex it may be the first in some edges
* in its disk cycle and the second for others. The bmesh_disk_XXX family of functions contain
* some nice utilities for navigating disk cycles in a way that hides this detail from the
Modified: trunk/blender/source/blender/bmesh/operators/bmo_slide.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_slide.c 2012-04-08 02:43:07 UTC (rev 45470)
+++ trunk/blender/source/blender/bmesh/operators/bmo_slide.c 2012-04-08 07:34:09 UTC (rev 45471)
@@ -48,7 +48,6 @@
BMVert *vertex;
BMEdge *edge;
BMEdge *slide_edge;
- int is_start_v1 = 0;
/* Selection counts */
int selected_edges = 0;
Modified: trunk/blender/source/blender/collada/DocumentExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/DocumentExporter.cpp 2012-04-08 02:43:07 UTC (rev 45470)
+++ trunk/blender/source/blender/collada/DocumentExporter.cpp 2012-04-08 07:34:09 UTC (rev 45471)
@@ -217,13 +217,13 @@
else {
asset.getContributor().mAuthor = "Blender User";
}
+ char version_buf[128];
#ifdef WITH_BUILDINFO
- char version_buf[128];
sprintf(version_buf, "Blender %d.%02d.%d r%s", BLENDER_VERSION/100, BLENDER_VERSION%100, BLENDER_SUBVERSION, build_rev);
- asset.getContributor().mAuthoringTool = version_buf;
#else
- asset.getContributor().mAuthoringTool = "Blender 2.6x";
+ sprintf(version_buf, "Blender %d.%02d.%d", BLENDER_VERSION/100, BLENDER_VERSION%100, BLENDER_SUBVERSION);
#endif
+ asset.getContributor().mAuthoringTool = version_buf;
asset.add();
// <library_cameras>
Modified: trunk/blender/source/blender/editors/mesh/editmesh_slide.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_slide.c 2012-04-08 02:43:07 UTC (rev 45470)
+++ trunk/blender/source/blender/editors/mesh/editmesh_slide.c 2012-04-08 07:34:09 UTC (rev 45471)
@@ -365,9 +365,6 @@
/* Nearest edge */
BMEdge *nst_edge = NULL;
- /* Temp Vtx */
- BMVert *start_vtx = vso->start_vtx;
-
const float mval_float[] = { (float)event->mval[0], (float)event->mval[1]};
/* Set mouse coords */
More information about the Bf-blender-cvs
mailing list