[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44536] trunk/blender/source/blender/bmesh /operators/bmo_create.c: Style Cleanup, no functional changes.
Campbell Barton
ideasman42 at gmail.com
Tue Feb 28 23:54:10 CET 2012
Revision: 44536
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44536
Author: campbellbarton
Date: 2012-02-28 22:54:09 +0000 (Tue, 28 Feb 2012)
Log Message:
-----------
Style Cleanup, no functional changes.
Modified Paths:
--------------
trunk/blender/source/blender/bmesh/operators/bmo_create.c
Modified: trunk/blender/source/blender/bmesh/operators/bmo_create.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_create.c 2012-02-28 22:52:09 UTC (rev 44535)
+++ trunk/blender/source/blender/bmesh/operators/bmo_create.c 2012-02-28 22:54:09 UTC (rev 44536)
@@ -1181,14 +1181,9 @@
v2 = edges1[0]->v2;
}
else {
- if (BM_vert_in_edge(edges1[1], edges1[0]->v1))
- v1 = edges1[0]->v2;
- else v1 = edges1[0]->v1;
-
- i = BLI_array_count(edges1) - 1;
- if (BM_vert_in_edge(edges1[i - 1], edges1[i]->v1))
- v2 = edges1[i]->v2;
- else v2 = edges1[i]->v1;
+ v1 = BM_vert_in_edge(edges1[1], edges1[0]->v1) ? edges1[0]->v2 : edges1[0]->v1;
+ i = BLI_array_count(edges1) - 1;
+ v2 = BM_vert_in_edge(edges1[i - 1], edges1[i]->v1) ? edges1[i]->v2 : edges1[i]->v1;
}
if (BLI_array_count(edges2) == 1) {
@@ -1196,17 +1191,12 @@
v4 = edges2[0]->v2;
}
else {
- if (BM_vert_in_edge(edges2[1], edges2[0]->v1))
- v3 = edges2[0]->v2;
- else v3 = edges2[0]->v1;
-
- i = BLI_array_count(edges2) - 1;
- if (BM_vert_in_edge(edges2[i - 1], edges2[i]->v1))
- v4 = edges2[i]->v2;
- else v4 = edges2[i]->v1;
+ v3 = BM_vert_in_edge(edges2[1], edges2[0]->v1) ? edges2[0]->v2 : edges2[0]->v1;
+ i = BLI_array_count(edges2) - 1;
+ v4 = BM_vert_in_edge(edges2[i - 1], edges2[i]->v1) ? edges2[i]->v2 : edges2[i]->v1;
}
- /* if there is ever bowtie quads between two edges the problem is here! [#] */
+ /* if there is ever bowtie quads between two edges the problem is here! [#30367] */
#if 0
normal_tri_v3(dvec1, v1->co, v2->co, v4->co);
normal_tri_v3(dvec2, v1->co, v4->co, v3->co);
@@ -1222,10 +1212,7 @@
}
#endif
if (dot_v3v3(dvec1, dvec2) < 0.0f) {
- BMVert *v;
- v = v3;
- v3 = v4;
- v4 = v;
+ SWAP(BMVert *, v3, v4);
}
e = BM_edge_create(bm, v1, v3, NULL, TRUE);
@@ -1235,18 +1222,12 @@
}
else if (edges1) {
BMVert *v1, *v2;
-
- if (BLI_array_count(edges1) > 1) {
- if (BM_vert_in_edge(edges1[1], edges1[0]->v1))
- v1 = edges1[0]->v2;
- else v1 = edges1[0]->v1;
- i = BLI_array_count(edges1) - 1;
- if (BM_vert_in_edge(edges1[i - 1], edges1[i]->v1))
- v2 = edges1[i]->v2;
- else v2 = edges1[i]->v1;
-
- e = BM_edge_create(bm, v1, v2, NULL, TRUE);
+ if (BLI_array_count(edges1) > 1) {
+ v1 = BM_vert_in_edge(edges1[1], edges1[0]->v1) ? edges1[0]->v2 : edges1[0]->v1;
+ i = BLI_array_count(edges1) - 1;
+ v2 = BM_vert_in_edge(edges1[i - 1], edges1[i]->v1) ? edges1[i]->v2 : edges1[i]->v1;
+ e = BM_edge_create(bm, v1, v2, NULL, TRUE);
BMO_elem_flag_enable(bm, e, ELE_NEW);
}
}
More information about the Bf-blender-cvs
mailing list