Revision: 46902
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46902
Author: campbellbarton
Date: 2012-05-22 16:09:31 +0000 (Tue, 22 May 2012)
Log Message:
-----------
style cleanup: relating to skin modifier
Modified Paths:
--------------
trunk/blender/source/blender/bmesh/intern/bmesh_marking.c
trunk/blender/source/blender/editors/object/object_modifier.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/python/bmesh/bmesh_py_types.c
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_marking.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_marking.c 2012-05-22
15:57:42 UTC (rev 46901)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_marking.c 2012-05-22
16:09:31 UTC (rev 46902)
@@ -612,8 +612,6 @@
}
}
-/* ref - editmesh_lib.cL:EM_editselection_plane() */
-
/* Calculate a plane that is rightangles to the edge/vert/faces normal
* also make the plane run along an axis that is related to the geometry,
* because this is used for the manipulators Y axis. */
Modified: trunk/blender/source/blender/editors/object/object_modifier.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_modifier.c
2012-05-22 15:57:42 UTC (rev 46901)
+++ trunk/blender/source/blender/editors/object/object_modifier.c
2012-05-22 16:09:31 UTC (rev 46902)
@@ -1350,19 +1350,19 @@
BM_data_layer_add(bm, &bm->vdata, CD_MVERT_SKIN);
/* Mark an arbitrary vertex as root */
- BM_ITER_MESH(v, &iter, bm, BM_VERTS_OF_MESH) {
+ BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) {
vs = CustomData_bmesh_get(&bm->vdata, v->head.data,
-
CD_MVERT_SKIN);
+ CD_MVERT_SKIN);
vs->flag |= MVERT_SKIN_ROOT;
break;
}
}
else if (!CustomData_has_layer(&me->vdata, CD_MVERT_SKIN)) {
vs = CustomData_add_layer(&me->vdata,
- CD_MVERT_SKIN,
- CD_DEFAULT,
- NULL,
- me->totvert);
+ CD_MVERT_SKIN,
+ CD_DEFAULT,
+ NULL,
+ me->totvert);
/* Mark an arbitrary vertex as root */
vs->flag |= MVERT_SKIN_ROOT;
@@ -1372,13 +1372,13 @@
static int skin_poll(bContext *C)
{
return (!CTX_data_edit_object(C) &&
- edit_modifier_poll_generic(C, &RNA_SkinModifier,
(1<<OB_MESH)));
+ edit_modifier_poll_generic(C, &RNA_SkinModifier, (1<<OB_MESH)));
}
static int skin_edit_poll(bContext *C)
{
return (CTX_data_edit_object(C) &&
- edit_modifier_poll_generic(C, &RNA_SkinModifier,
(1<<OB_MESH)));
+ edit_modifier_poll_generic(C, &RNA_SkinModifier, (1<<OB_MESH)));
}
static void skin_root_clear(BMesh *bm, BMVert *bm_vert, GHash *visited)
@@ -1386,13 +1386,13 @@
BMEdge *bm_edge;
BMIter bm_iter;
- BM_ITER_ELEM(bm_edge, &bm_iter, bm_vert, BM_EDGES_OF_VERT) {
+ BM_ITER_ELEM (bm_edge, &bm_iter, bm_vert, BM_EDGES_OF_VERT) {
BMVert *v2 = BM_edge_other_vert(bm_edge, bm_vert);
if(!BLI_ghash_lookup(visited, v2)) {
MVertSkin *vs = CustomData_bmesh_get(&bm->vdata,
-
v2->head.data,
-
CD_MVERT_SKIN);
+ v2->head.data,
+ CD_MVERT_SKIN);
/* clear vertex root flag and add to visited set */
vs->flag &= ~MVERT_SKIN_ROOT;
@@ -1416,13 +1416,13 @@
modifier_skin_customdata_ensure(ob);
- BM_ITER_MESH(bm_vert, &bm_iter, bm, BM_VERTS_OF_MESH) {
+ BM_ITER_MESH (bm_vert, &bm_iter, bm, BM_VERTS_OF_MESH) {
if(!BLI_ghash_lookup(visited, bm_vert) &&
bm_vert->head.hflag & BM_ELEM_SELECT)
{
MVertSkin *vs = CustomData_bmesh_get(&bm->vdata,
-
bm_vert->head.data,
-
CD_MVERT_SKIN);
+ bm_vert->head.data,
+ CD_MVERT_SKIN);
/* mark vertex as root and add to visited set */
vs->flag |= MVERT_SKIN_ROOT;
@@ -1456,7 +1456,7 @@
typedef enum {
SKIN_LOOSE_MARK,
- SKIN_LOOSE_CLEAR,
+ SKIN_LOOSE_CLEAR
} SkinLooseAction;
static int skin_loose_mark_clear_exec(bContext *C, wmOperator *op)
@@ -1468,11 +1468,11 @@
BMIter bm_iter;
SkinLooseAction action = RNA_enum_get(op->ptr, "action");
- BM_ITER_MESH(bm_vert, &bm_iter, bm, BM_VERTS_OF_MESH) {
+ BM_ITER_MESH (bm_vert, &bm_iter, bm, BM_VERTS_OF_MESH) {
if (bm_vert->head.hflag & BM_ELEM_SELECT) {
MVertSkin *vs = CustomData_bmesh_get(&bm->vdata,
-
bm_vert->head.data,
-
CD_MVERT_SKIN);
+ bm_vert->head.data,
+ CD_MVERT_SKIN);
switch (action) {
@@ -1520,11 +1520,11 @@
BMVert *bm_vert;
BMIter bm_iter;
- BM_ITER_MESH(bm_vert, &bm_iter, bm, BM_VERTS_OF_MESH) {
+ BM_ITER_MESH (bm_vert, &bm_iter, bm, BM_VERTS_OF_MESH) {
if (bm_vert->head.hflag & BM_ELEM_SELECT) {
MVertSkin *vs = CustomData_bmesh_get(&bm->vdata,
-
bm_vert->head.data,
-
CD_MVERT_SKIN);
+ bm_vert->head.data,
+ CD_MVERT_SKIN);
float avg = (vs->radius[0] + vs->radius[1]) * 0.5f;
vs->radius[0] = vs->radius[1] = avg;
Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c
2012-05-22 15:57:42 UTC (rev 46901)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c
2012-05-22 16:09:31 UTC (rev 46902)
@@ -3007,7 +3007,7 @@
BMLoop *loop;
int is_first = TRUE;
- BM_ITER_ELEM(loop, &liter, efa,
BM_LOOPS_OF_FACE) {
+ BM_ITER_ELEM (loop, &liter, efa,
BM_LOOPS_OF_FACE) {
if (is_face_sel || (do_moving &&
BM_elem_flag_test(loop->v, BM_ELEM_SELECT))) {
float angle;
Modified: trunk/blender/source/blender/python/bmesh/bmesh_py_types.c
===================================================================
--- trunk/blender/source/blender/python/bmesh/bmesh_py_types.c 2012-05-22
15:57:42 UTC (rev 46901)
+++ trunk/blender/source/blender/python/bmesh/bmesh_py_types.c 2012-05-22
16:09:31 UTC (rev 46902)
@@ -2065,7 +2065,7 @@
int index = 0;
const char htype = bm_iter_itype_htype_map[self->itype];
- BM_ITER_BPY_BM_SEQ(ele, &iter, self) {
+ BM_ITER_BPY_BM_SEQ (ele, &iter, self) {
BM_elem_index_set(ele, index); /* set_dirty! */
index++;
}
@@ -2278,7 +2278,7 @@
BMHeader *ele;
Py_ssize_t tot = 0;
- BM_ITER_BPY_BM_SEQ(ele, &iter, self) {
+ BM_ITER_BPY_BM_SEQ (ele, &iter, self) {
tot++;
}
return tot;
@@ -2409,7 +2409,7 @@
if (value_bm_ele->bm == self->bm) {
BMElem *ele, *ele_test = value_bm_ele->ele;
BMIter iter;
- BM_ITER_BPY_BM_SEQ(ele, &iter, self) {
+ BM_ITER_BPY_BM_SEQ (ele, &iter, self) {
if (ele == ele_test) {
return 1;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
