[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44484] trunk/blender/source/blender: minor bmesh api naming edits.
Campbell Barton
ideasman42 at gmail.com
Mon Feb 27 15:07:24 CET 2012
Revision: 44484
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44484
Author: campbellbarton
Date: 2012-02-27 14:07:19 +0000 (Mon, 27 Feb 2012)
Log Message:
-----------
minor bmesh api naming edits.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/multires.c
trunk/blender/source/blender/bmesh/bmesh.h
trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c
trunk/blender/source/blender/bmesh/intern/bmesh_newcore.c
trunk/blender/source/blender/bmesh/intern/bmesh_operators.c
trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c
trunk/blender/source/blender/bmesh/intern/bmesh_private.h
trunk/blender/source/blender/bmesh/tools/BME_bevel.c
trunk/blender/source/blender/editors/mesh/bmesh_tools.c
trunk/blender/source/blender/editors/mesh/knifetool.c
trunk/blender/source/blender/editors/mesh/loopcut.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/modifiers/intern/MOD_array.c
Modified: trunk/blender/source/blender/blenkernel/intern/multires.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/multires.c 2012-02-27 13:47:53 UTC (rev 44483)
+++ trunk/blender/source/blender/blenkernel/intern/multires.c 2012-02-27 14:07:19 UTC (rev 44484)
@@ -726,7 +726,7 @@
int i, k, /*numGrids,*/ gridSize, dGridSize, dSkip;
int totloop, totpoly;
- /*this happens in the dm made by bmesh_set_mdisps_space*/
+ /* this happens in the dm made by bmesh_mdisps_space_set */
if (dm2 && CustomData_has_layer(&dm2->loopData, CD_MDISPS)) {
mpoly = CustomData_get_layer(&dm2->polyData, CD_MPOLY);
mdisps = CustomData_get_layer(&dm2->loopData, CD_MDISPS);
Modified: trunk/blender/source/blender/bmesh/bmesh.h
===================================================================
--- trunk/blender/source/blender/bmesh/bmesh.h 2012-02-27 13:47:53 UTC (rev 44483)
+++ trunk/blender/source/blender/bmesh/bmesh.h 2012-02-27 14:07:19 UTC (rev 44484)
@@ -342,8 +342,8 @@
BMFace *BM_face_at_index(BMesh *bm, const int index);
/*start/stop edit*/
-void bmesh_begin_edit(BMesh *bm, int flag);
-void bmesh_end_edit(BMesh *bm, int flag);
+void bmesh_edit_begin(BMesh *bm, int flag);
+void bmesh_edit_end(BMesh *bm, int flag);
#ifdef USE_BMESH_HOLES
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c 2012-02-27 13:47:53 UTC (rev 44483)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c 2012-02-27 14:07:19 UTC (rev 44484)
@@ -235,7 +235,7 @@
continue;
#endif
- bmesh_update_face_normal(bm, f, f->no, projectverts);
+ bmesh_face_normal_update(bm, f, f->no, projectverts);
}
/* Zero out vertex normals */
@@ -351,7 +351,7 @@
BMO_op_finish(bm, &bmop);
}
-static void bmesh_set_mdisps_space(BMesh *bm, int from, int to)
+static void bmesh_mdisps_space_set(BMesh *bm, int from, int to)
{
/* switch multires data out of tangent space */
if (CustomData_has_layer(&bm->ldata, CD_MDISPS)) {
@@ -410,7 +410,7 @@
* the editing operations are done. These are called by the tools/operator
* API for each time a tool is executed.
*/
-void bmesh_begin_edit(BMesh *bm, int flag)
+void bmesh_edit_begin(BMesh *bm, int flag)
{
bm->opflag = flag;
@@ -422,7 +422,7 @@
#if BMOP_UNTAN_MULTIRES_ENABLED
/* switch multires data out of tangent space */
if ((flag & BMO_OP_FLAG_UNTAN_MULTIRES) && CustomData_has_layer(&bm->ldata, CD_MDISPS)) {
- bmesh_set_mdisps_space(bm, MULTIRES_SPACE_TANGENT, MULTIRES_SPACE_ABSOLUTE);
+ bmesh_mdisps_space_set(bm, MULTIRES_SPACE_TANGENT, MULTIRES_SPACE_ABSOLUTE);
/* ensure correct normals, if possible */
bmesh_rationalize_normals(bm, 0);
@@ -438,15 +438,15 @@
#endif
}
-void bmesh_end_edit(BMesh *bm, int flag)
+void bmesh_edit_end(BMesh *bm, int flag)
{
- /* BMO_OP_FLAG_UNTAN_MULTIRES disabled for now, see comment above in bmesh_begin_edit. */
+ /* BMO_OP_FLAG_UNTAN_MULTIRES disabled for now, see comment above in bmesh_edit_begin. */
#if BMOP_UNTAN_MULTIRES_ENABLED
/* switch multires data into tangent space */
if ((flag & BMO_OP_FLAG_UNTAN_MULTIRES) && CustomData_has_layer(&bm->ldata, CD_MDISPS)) {
/* set normals to their previous winding */
bmesh_rationalize_normals(bm, 1);
- bmesh_set_mdisps_space(bm, MULTIRES_SPACE_ABSOLUTE, MULTIRES_SPACE_TANGENT);
+ bmesh_mdisps_space_set(bm, MULTIRES_SPACE_ABSOLUTE, MULTIRES_SPACE_TANGENT);
}
else if (flag & BMO_OP_FLAG_RATIONALIZE_NORMALS) {
bmesh_rationalize_normals(bm, 1);
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_newcore.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_newcore.c 2012-02-27 13:47:53 UTC (rev 44483)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_newcore.c 2012-02-27 14:07:19 UTC (rev 44484)
@@ -153,7 +153,7 @@
return e;
}
-static BMLoop *bmesh_create_loop(BMesh *bm, BMVert *v, BMEdge *e, BMFace *f, const BMLoop *example)
+static BMLoop *bmesh_loop_create(BMesh *bm, BMVert *v, BMEdge *e, BMFace *f, const BMLoop *example)
{
BMLoop *l = NULL;
@@ -181,7 +181,7 @@
#ifdef USE_BMESH_HOLES
BMLoopList *lst = BLI_mempool_calloc(bm->looplistpool);
#endif
- BMLoop *l = bmesh_create_loop(bm, startv, starte, f, NULL);
+ BMLoop *l = bmesh_loop_create(bm, startv, starte, f, NULL);
bmesh_radial_append(starte, l);
@@ -301,7 +301,7 @@
startl->v = verts[0];
startl->e = edges[0];
for (i = 1; i < len; i++) {
- l = bmesh_create_loop(bm, verts[i], edges[i], f, edges[i]->l);
+ l = bmesh_loop_create(bm, verts[i], edges[i], f, edges[i]->l);
l->f = f;
bmesh_radial_append(edges[i], l);
@@ -330,7 +330,7 @@
return f;
}
-int bmesh_check_element(BMesh *UNUSED(bm), void *element, const char htype)
+int bmesh_element_check(BMesh *UNUSED(bm), void *element, const char htype)
{
BMHeader *head = element;
int err = 0;
@@ -761,7 +761,7 @@
#endif
}
-static void bmesh_systag_elements(BMesh *UNUSED(bm), void *veles, int tot, int flag)
+static void bmesh_elements_systag_enable(BMesh *UNUSED(bm), void *veles, int tot, int flag)
{
BMHeader **eles = veles;
int i;
@@ -771,7 +771,7 @@
}
}
-static void bmesh_clear_systag_elements(BMesh *UNUSED(bm), void *veles, int tot, int flag)
+static void bmesh_elements_systag_disable(BMesh *UNUSED(bm), void *veles, int tot, int flag)
{
BMHeader **eles = veles;
int i;
@@ -896,7 +896,7 @@
if (totface == 1)
return faces[0];
- bmesh_systag_elements(bm, faces, totface, _FLAG_JF);
+ bmesh_elements_systag_enable(bm, faces, totface, _FLAG_JF);
for (i = 0; i < totface; i++) {
f = faces[i];
@@ -1007,7 +1007,7 @@
} while ((l_iter = l_iter->next) != l_first);
}
- bmesh_clear_systag_elements(bm, faces, totface, _FLAG_JF);
+ bmesh_elements_systag_disable(bm, faces, totface, _FLAG_JF);
BM_ELEM_API_FLAG_DISABLE(newf, _FLAG_JF);
/* handle multires data */
@@ -1036,7 +1036,7 @@
BM_CHECK_ELEMENT(bm, newf);
return newf;
error:
- bmesh_clear_systag_elements(bm, faces, totface, _FLAG_JF);
+ bmesh_elements_systag_disable(bm, faces, totface, _FLAG_JF);
BLI_array_free(edges);
BLI_array_free(deledges);
BLI_array_free(delverts);
@@ -1158,8 +1158,8 @@
e = BM_edge_create(bm, v1, v2, example, FALSE);
f2 = bmesh_addpolylist(bm, f);
- f1loop = bmesh_create_loop(bm, v2, e, f, v2loop);
- f2loop = bmesh_create_loop(bm, v1, e, f2, v1loop);
+ f1loop = bmesh_loop_create(bm, v2, e, f, v2loop);
+ f2loop = bmesh_loop_create(bm, v1, e, f2, v1loop);
f1loop->prev = v2loop->prev;
f2loop->prev = v1loop->prev;
@@ -1307,7 +1307,7 @@
nextl = nextl != nextl->radial_next ? nextl->radial_next : NULL;
bmesh_radial_loop_remove(l, NULL);
- nl = bmesh_create_loop(bm, NULL, NULL, l->f, l);
+ nl = bmesh_loop_create(bm, NULL, NULL, l->f, l);
nl->prev = l;
nl->next = (l->next);
nl->prev->next = nl;
@@ -1768,7 +1768,7 @@
* vertex for each region. returns an array of all resulting
* vertices.
*/
-static int bmesh_cutvert(BMesh *bm, BMVert *v, BMVert ***vout, int *len)
+static int bmesh_vert_cut(BMesh *bm, BMVert *v, BMVert ***vout, int *len)
{
BMEdge **stack = NULL;
BLI_array_declare(stack);
@@ -1780,7 +1780,7 @@
int i, maxindex;
BMLoop *nl;
- visithash = BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp, "bmesh_cutvert visithash");
+ visithash = BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp, "bmesh_vert_cut visithash");
maxindex = 0;
BM_ITER(e, &eiter, bm, BM_EDGES_OF_VERT, v) {
@@ -1808,7 +1808,7 @@
}
/* Make enough verts to split v for each group */
- verts = MEM_callocN(sizeof(BMVert *) * maxindex, "bmesh_cutvert");
+ verts = MEM_callocN(sizeof(BMVert *) * maxindex, "bmesh_vert_cut");
verts[0] = v;
for (i = 1; i < maxindex; i++) {
verts[i] = BM_vert_create(bm, v->co, v);
@@ -1908,7 +1908,7 @@
* Does nothing if cutl is already the only loop in the
* edge radial.
*/
-static int bmesh_cutedge(BMesh *bm, BMEdge *e, BMLoop *cutl)
+static int bmesh_edge_cut(BMesh *bm, BMEdge *e, BMLoop *cutl)
{
BMEdge *ne;
int radlen;
@@ -1954,8 +1954,8 @@
/* peel the face from the edge radials on both sides of the
* loop vert, disconnecting the face from its fan */
- bmesh_cutedge(bm, sl->e, sl);
- bmesh_cutedge(bm, sl->prev->e, sl->prev);
+ bmesh_edge_cut(bm, sl->e, sl);
+ bmesh_edge_cut(bm, sl->prev->e, sl->prev);
if (bmesh_disk_count(sv) == 2) {
/* If there are still only two edges out of sv, then
@@ -1964,7 +1964,7 @@
}
/* Update the disk start, so that v->e points to an edge
- * not touching the split loop. This is so that bmesh_cutvert
+ * not touching the split loop. This is so that bmesh_vert_cut
* will leave the original sv on some *other* fan (not the
* one-face fan that holds the unglue face). */
while (sv->e == sl->e || sv->e == sl->prev->e) {
@@ -1973,7 +1973,7 @@
/* Split all fans connected to the vert, duplicating it for
* each fans. */
- bmesh_cutvert(bm, sv, &vtar, &len);
+ bmesh_vert_cut(bm, sv, &vtar, &len);
/* There should have been at least two fans cut apart here,
* otherwise the early exit would have kicked in. */
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_operators.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_operators.c 2012-02-27 13:47:53 UTC (rev 44483)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_operators.c 2012-02-27 14:07:19 UTC (rev 44484)
@@ -176,11 +176,11 @@
BMO_push(bm, op);
if (bm->stackdepth == 2)
- bmesh_begin_edit(bm, op->flag);
+ bmesh_edit_begin(bm, op->flag);
op->exec(bm, op);
if (bm->stackdepth == 2)
- bmesh_end_edit(bm, op->flag);
+ bmesh_edit_end(bm, op->flag);
BMO_pop(bm);
}
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c 2012-02-27 13:47:53 UTC (rev 44483)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c 2012-02-27 14:07:19 UTC (rev 44484)
@@ -422,7 +422,7 @@
BLI_array_fixedstack_declare(proj, BM_NGON_STACK_SIZE, f->len, __func__);
- bmesh_update_face_normal(bm, f, f->no, proj);
+ bmesh_face_normal_update(bm, f, f->no, proj);
BLI_array_fixedstack_free(proj);
}
@@ -435,7 +435,7 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list