[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44808] trunk/blender/source/blender: fix for debug assignment left in from own commit r44778
Campbell Barton
ideasman42 at gmail.com
Sun Mar 11 16:27:14 CET 2012
Revision: 44808
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44808
Author: campbellbarton
Date: 2012-03-11 15:27:08 +0000 (Sun, 11 Mar 2012)
Log Message:
-----------
fix for debug assignment left in from own commit r44778
also removed private face normal update functions - they were same as public.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44778
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c
trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c
trunk/blender/source/blender/bmesh/intern/bmesh_polygon.h
trunk/blender/source/blender/bmesh/intern/bmesh_private.h
trunk/blender/source/blender/makesrna/intern/rna_object_api.c
Modified: trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c 2012-03-11 12:15:39 UTC (rev 44807)
+++ trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c 2012-03-11 15:27:08 UTC (rev 44808)
@@ -1689,7 +1689,7 @@
i = 0;
BM_ITER(efa, &fiter, bm, BM_FACES_OF_MESH, NULL) {
BM_elem_index_set(efa, i); /* set_inline */
- BM_face_normal_update_vcos(bm, efa, bmdm->polyNos[i], vertexCos);
+ BM_face_normal_update_vcos(bm, efa, bmdm->polyNos[i], (float const (*)[3])vertexCos);
i++;
}
bm->elem_index_dirty &= ~BM_FACE;
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c 2012-03-11 12:15:39 UTC (rev 44807)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c 2012-03-11 15:27:08 UTC (rev 44808)
@@ -228,7 +228,7 @@
continue;
#endif
- bmesh_face_normal_update(bm, f, f->no);
+ BM_face_normal_update(bm, f);
}
/* Zero out vertex normals */
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c 2012-03-11 12:15:39 UTC (rev 44807)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c 2012-03-11 15:27:08 UTC (rev 44808)
@@ -75,15 +75,13 @@
* polygon See Graphics Gems for
* computing newell normal.
*/
-static void compute_poly_normal(float normal[3], float (*verts)[3], int nverts)
+static void compute_poly_normal(float normal[3], float const (* verts)[3], int nverts)
{
float const *v_prev = verts[nverts - 1];
float const *v_curr = verts[0];
float n[3] = {0.0f};
int i;
- verts[0][0] = 1;
-
/* Newell's Method */
for (i = 0; i < nverts; v_prev = v_curr, v_curr = verts[++i]) {
n[0] += (v_prev[1] - v_curr[1]) * (v_prev[2] + v_curr[2]);
@@ -132,14 +130,15 @@
* Same as #compute_poly_normal and #bm_face_compute_poly_normal
* but takes an array of vertex locations.
*/
-static void bm_face_compute_poly_normal_vcos(BMFace *f, float (*vertexCos)[3])
+static void bm_face_compute_poly_normal_vertex_cos(BMFace *f, float n[3],
+ float const (*vertexCos)[3])
{
BMLoop *l_first = BM_FACE_FIRST_LOOP(f);
BMLoop *l_iter = l_first;
float const *v_prev = vertexCos[BM_elem_index_get(l_first->prev->v)];
float const *v_curr = vertexCos[BM_elem_index_get(l_first->v)];
- float n[3] = {0.0f};
+ zero_v3(n);
/* Newell's Method */
do {
@@ -152,8 +151,8 @@
v_curr = vertexCos[BM_elem_index_get(l_iter->v)];
} while (l_iter != l_first);
- if (UNLIKELY(normalize_v3_v3(f->no, n) == 0.0f)) {
- f->no[2] = 1.0f; /* other axis set to 0.0 */
+ if (UNLIKELY(normalize_v3(n) == 0.0f)) {
+ n[2] = 1.0f; /* other axis set to 0.0 */
}
}
@@ -164,7 +163,7 @@
* area of a polygon in the X/Y
* plane.
*/
-static int compute_poly_center(float center[3], float *r_area, float (*verts)[3], int nverts)
+static int compute_poly_center(float center[3], float *r_area, float (* const verts)[3], int nverts)
{
int i, j;
float atmp = 0.0f, xtmp = 0.0f, ytmp = 0.0f, ai;
@@ -360,25 +359,6 @@
}
/**
- * \brief BMESH UPDATE FACE NORMAL
- *
- * Updates the stored normal for the
- * given face. Requires that a buffer
- * of sufficient length to store projected
- * coordinates for all of the face's vertices
- * is passed in as well.
- */
-void BM_face_normal_update(BMesh *bm, BMFace *f)
-{
- bmesh_face_normal_update(bm, f, f->no);
-}
-/* same as BM_face_normal_update but takes vertex coords */
-void BM_face_normal_update_vcos(BMesh *bm, BMFace *f, float no[3], float (*vertexCos)[3])
-{
- bmesh_face_normal_update_vertex_cos(bm, f, no, vertexCos);
-}
-
-/**
* updates face and vertex normals incident on an edge
*/
void BM_edge_normals_update(BMesh *bm, BMEdge *e)
@@ -440,7 +420,17 @@
BM_vert_normal_update(bm, v);
}
-void bmesh_face_normal_update(BMesh *UNUSED(bm), BMFace *f, float no[3])
+/**
+ * \brief BMESH UPDATE FACE NORMAL
+ *
+ * Updates the stored normal for the
+ * given face. Requires that a buffer
+ * of sufficient length to store projected
+ * coordinates for all of the face's vertices
+ * is passed in as well.
+ */
+
+void BM_face_normal_update(BMesh *UNUSED(bm), BMFace *f)
{
BMLoop *l;
@@ -453,7 +443,7 @@
const float *co3 = (l = l->next)->v->co;
const float *co4 = (l->next)->v->co;
- normal_quad_v3(no, co1, co2, co3, co4);
+ normal_quad_v3(f->no, co1, co2, co3, co4);
break;
}
case 3:
@@ -462,12 +452,12 @@
const float *co2 = (l = l->next)->v->co;
const float *co3 = (l->next)->v->co;
- normal_tri_v3(no, co1, co2, co3);
+ normal_tri_v3(f->no, co1, co2, co3);
break;
}
case 0:
{
- zero_v3(no);
+ zero_v3(f->no);
break;
}
default:
@@ -478,8 +468,8 @@
}
}
/* exact same as 'bmesh_face_normal_update' but accepts vertex coords */
-void bmesh_face_normal_update_vertex_cos(BMesh *bm, BMFace *f, float no[3],
- float (*vertexCos)[3])
+void BM_face_normal_update_vcos(BMesh *bm, BMFace *f, float no[3],
+ float const (*vertexCos)[3])
{
BMLoop *l;
@@ -514,7 +504,7 @@
}
default:
{
- bm_face_compute_poly_normal_vcos(f, vertexCos);
+ bm_face_compute_poly_normal_vertex_cos(f, no, vertexCos);
break;
}
}
@@ -634,7 +624,7 @@
return crosses % 2 != 0;
}
-static int goodline(float (*projectverts)[3], BMFace *f, int v1i,
+static int goodline(float const (*projectverts)[3], BMFace *f, int v1i,
int v2i, int v3i, int UNUSED(nvert))
{
BMLoop *l_iter;
@@ -720,7 +710,7 @@
if (BM_edge_exists(v1, v3)) {
isear = 0;
}
- else if (!goodline(verts, f, BM_elem_index_get(v1), BM_elem_index_get(v2), BM_elem_index_get(v3), nvert)) {
+ 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;
}
@@ -785,7 +775,7 @@
///bmesh_face_normal_update(bm, f, f->no, projectverts);
- compute_poly_normal(f->no, projectverts, f->len);
+ compute_poly_normal(f->no, (float const (*)[3])projectverts, f->len);
poly_rotate_plane(f->no, projectverts, i);
nvert = f->len;
@@ -899,7 +889,7 @@
a++;
}
- compute_poly_normal(no, projverts, f->len);
+ compute_poly_normal(no, (float const (*)[3])projverts, f->len);
poly_rotate_plane(no, projverts, f->len);
poly_rotate_plane(no, edgeverts, len * 2);
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_polygon.h
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_polygon.h 2012-03-11 12:15:39 UTC (rev 44807)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_polygon.h 2012-03-11 15:27:08 UTC (rev 44808)
@@ -32,7 +32,8 @@
void BM_face_center_mean_calc(BMesh *bm, BMFace *f, float center[3]);
void BM_face_normal_update(BMesh *bm, BMFace *f);
-void BM_face_normal_update_vcos(BMesh *bm, BMFace *f, float no[3], float (*vertexCos)[3]);
+void BM_face_normal_update_vcos(BMesh *bm, BMFace *f, float no[3],
+ float const (*vertexCos)[3]);
void BM_edge_normals_update(BMesh *bm, BMEdge *e);
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_private.h
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_private.h 2012-03-11 12:15:39 UTC (rev 44807)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_private.h 2012-03-11 15:27:08 UTC (rev 44808)
@@ -65,10 +65,6 @@
#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 bmesh_face_normal_update(BMesh *bm, BMFace *f, float no[3]);
-void bmesh_face_normal_update_vertex_cos(BMesh *bm, BMFace *f, float no[3],
- float (*vertexCos)[3]);
-
void compute_poly_plane(float (*verts)[3], int nverts);
void poly_rotate_plane(const float normal[3], float (*verts)[3], const int nverts);
Modified: trunk/blender/source/blender/makesrna/intern/rna_object_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object_api.c 2012-03-11 12:15:39 UTC (rev 44807)
+++ trunk/blender/source/blender/makesrna/intern/rna_object_api.c 2012-03-11 15:27:08 UTC (rev 44808)
@@ -527,7 +527,7 @@
static EnumPropertyItem mesh_dm_info_items[] = {
{0, "SOURCE", 0, "Source", "Source mesh"},
{1, "DEFORM", 0, "Deform", "Objects deform mesh"},
- {2, "FINAL", 0, "Final", "Objects final mesh"},
+ {2, "FINAL", 0, "Final", "Objects final mesh"},
{0, NULL, 0, NULL, NULL}
};
#endif
More information about the Bf-blender-cvs
mailing list