[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42783] branches/bmesh/blender/source/ blender: use TRUE/FALSE rather then 1/0, no functional changes.
Campbell Barton
ideasman42 at gmail.com
Wed Dec 21 04:33:43 CET 2011
Revision: 42783
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42783
Author: campbellbarton
Date: 2011-12-21 03:33:32 +0000 (Wed, 21 Dec 2011)
Log Message:
-----------
use TRUE/FALSE rather then 1/0, no functional changes.
Modified Paths:
--------------
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
branches/bmesh/blender/source/blender/bmesh/intern/editmesh_to_bmesh.c
branches/bmesh/blender/source/blender/bmesh/operators/createops.c
branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
branches/bmesh/blender/source/blender/bmesh/operators/primitiveops.c
branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c
branches/bmesh/blender/source/blender/bmesh/tools/BME_dupe_ops.c
branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c
branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c
branches/bmesh/blender/source/blender/editors/mesh/loopcut.c
branches/bmesh/blender/source/blender/editors/object/object_hook.c
branches/bmesh/blender/source/blender/editors/transform/transform.c
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c 2011-12-21 02:41:27 UTC (rev 42782)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c 2011-12-21 03:33:32 UTC (rev 42783)
@@ -470,7 +470,7 @@
return;
/*First we copy select*/
- if(BM_Selected(source_mesh, source)) BM_Select(target_mesh, target, 1);
+ if(BM_Selected(source_mesh, source)) BM_Select(target_mesh, target, TRUE);
/*Now we copy flags*/
theader->hflag = sheader->hflag;
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c 2011-12-21 02:41:27 UTC (rev 42782)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c 2011-12-21 03:33:32 UTC (rev 42783)
@@ -187,8 +187,8 @@
if (!BM_TestHFlag(e, BM_SELECT)) bm->totedgesel += 1;
BM_SetHFlag(&(e->head), BM_SELECT);
- BM_Select(bm, e->v1, 1);
- BM_Select(bm, e->v2, 1);
+ BM_Select(bm, e->v1, TRUE);
+ BM_Select(bm, e->v2, TRUE);
}else{
if (BM_TestHFlag(e, BM_SELECT)) bm->totedgesel -= 1;
BM_ClearHFlag(&(e->head), BM_SELECT);
@@ -218,12 +218,13 @@
}
}
- if(deselect) BM_Select_Vert(bm, verts[i], 0);
+ if(deselect) BM_Select_Vert(bm, verts[i], FALSE);
}
- }else{
- BM_Select(bm, e->v1, 0);
- BM_Select(bm, e->v2, 0);
}
+ else {
+ BM_Select(bm, e->v1, FALSE);
+ BM_Select(bm, e->v2, FALSE);
+ }
}
}
@@ -251,8 +252,8 @@
BM_SetHFlag(&(f->head), BM_SELECT);
l=(BMLoop*) bm_firstfaceloop(f);
do{
- BM_Select_Vert(bm, l->v, 1);
- BM_Select_Edge(bm, l->e, 1);
+ BM_Select_Vert(bm, l->v, TRUE);
+ BM_Select_Edge(bm, l->e, TRUE);
l = l->next;
}while(l != bm_firstfaceloop(f));
}
@@ -274,7 +275,7 @@
if (!f2)
{
- BM_Select(bm, l->e, 0);
+ BM_Select(bm, l->e, FALSE);
}
}
@@ -287,9 +288,8 @@
break;
}
- if (!e)
- {
- BM_Select(bm, l->v, 0);
+ if (!e) {
+ BM_Select(bm, l->v, FALSE);
}
}
}
@@ -324,18 +324,20 @@
else if(bm->selectmode & SCE_SELECT_EDGE) {
for(v= BMIter_New(&verts, bm, BM_VERTS_OF_MESH, bm ); v; v= BMIter_Step(&verts))
BM_ClearHFlag(v, 0);
- for(e= BMIter_New(&edges, bm, BM_EDGES_OF_MESH, bm ); e; e= BMIter_Step(&edges)){
- if(BM_TestHFlag(&(e->head), BM_SELECT))
- BM_Select_Edge(bm, e, 1);
+ for(e= BMIter_New(&edges, bm, BM_EDGES_OF_MESH, bm ); e; e= BMIter_Step(&edges)) {
+ if(BM_TestHFlag(&(e->head), BM_SELECT)) {
+ BM_Select_Edge(bm, e, TRUE);
+ }
}
BM_SelectMode_Flush(bm);
}
else if(bm->selectmode & SCE_SELECT_FACE) {
for(e = BMIter_New(&edges, bm, BM_EDGES_OF_MESH, bm ); e; e= BMIter_Step(&edges))
BM_ClearHFlag(e, 0);
- for(f = BMIter_New(&faces, bm, BM_FACES_OF_MESH, bm ); f; f= BMIter_Step(&faces)){
- if(BM_TestHFlag(&(f->head), BM_SELECT))
- BM_Select_Face(bm, f, 1);
+ for(f = BMIter_New(&faces, bm, BM_FACES_OF_MESH, bm ); f; f= BMIter_Step(&faces)) {
+ if(BM_TestHFlag(&(f->head), BM_SELECT)) {
+ BM_Select_Face(bm, f, TRUE);
+ }
}
BM_SelectMode_Flush(bm);
}
@@ -649,7 +651,7 @@
for (i=0; i<3; i++) {
ele = BMIter_New(&iter, bm, itypes[i], NULL);
for ( ; ele; ele=BMIter_Step(&iter)) {
- if (hflag & BM_SELECT) BM_Select(bm, ele, 0);
+ if (hflag & BM_SELECT) BM_Select(bm, ele, FALSE);
BM_ClearHFlag(ele, hflag);
}
}
@@ -746,7 +748,7 @@
/*Follow convention of always deselecting before
hiding an element*/
if (hide)
- BM_Select(bm, element, 0);
+ BM_Select(bm, element, FALSE);
switch (h->htype) {
case BM_VERT:
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c 2011-12-21 02:41:27 UTC (rev 42782)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c 2011-12-21 03:33:32 UTC (rev 42783)
@@ -734,7 +734,7 @@
continue;
if (hflag & BM_SELECT) {
- BM_Select(bm, data[i], 1);
+ BM_Select(bm, data[i], TRUE);
}
BM_SetHFlag(data[i], hflag);
}
@@ -758,8 +758,10 @@
if (!(htype & data[i]->htype))
continue;
- if (hflag & BM_SELECT)
- BM_Select(bm, data[i], 0);
+ if (hflag & BM_SELECT) {
+ BM_Select(bm, data[i], FALSE);
+ }
+
BM_ClearHFlag(data[i], hflag);
}
}
Modified: branches/bmesh/blender/source/blender/bmesh/intern/editmesh_to_bmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/editmesh_to_bmesh.c 2011-12-21 02:41:27 UTC (rev 42782)
+++ branches/bmesh/blender/source/blender/bmesh/intern/editmesh_to_bmesh.c 2011-12-21 03:33:32 UTC (rev 42783)
@@ -127,7 +127,7 @@
/*transfer flags*/
v->head.flag = eve->h ? BM_HIDDEN : 0;
- if(eve->f & SELECT) BM_Select_Vert(bm, v, 1);
+ if(eve->f & SELECT) BM_Select_Vert(bm, v, TRUE);
v->bweight = eve->bweight;
BMO_Insert_MapPointer(bm, op, "map", eve, v);
@@ -228,7 +228,7 @@
f->head.flag = 0;
f->mat_nr = efa->mat_nr;
- if(efa->f & SELECT) BM_Select_Face(bm, f, 1);
+ if(efa->f & SELECT) BM_Select_Face(bm, f, TRUE);
if (efa->flag & ME_SMOOTH) f->head.flag |= BM_SMOOTH;
if(efa->h) f->head.flag |= BM_HIDDEN;
Modified: branches/bmesh/blender/source/blender/bmesh/operators/createops.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/createops.c 2011-12-21 02:41:27 UTC (rev 42782)
+++ branches/bmesh/blender/source/blender/bmesh/operators/createops.c 2011-12-21 03:33:32 UTC (rev 42783)
@@ -568,11 +568,11 @@
BM_SetIndex(v2, -1); /* set_dirty! */
//BM_Make_Edge(bm, cv, v2, NULL, 0);
- BM_Select(bm, v2, 1);
+ BM_Select(bm, v2, TRUE);
if (lastv) {
e2 =
BM_Make_Edge(bm, lastv, v2, NULL, 0);
- BM_Select(bm, e2, 1);
+ BM_Select(bm, e2, TRUE);
}
lastv = v2;
Modified: branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c 2011-12-21 02:41:27 UTC (rev 42782)
+++ branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c 2011-12-21 03:33:32 UTC (rev 42783)
@@ -135,7 +135,7 @@
v->head.hflag = BM_Vert_Flag_From_MEFlag(mvert->flag);
/*this is necassary for selection counts to work properly*/
- if (BM_TestHFlag(v, BM_SELECT)) BM_Select_Vert(bm, v, 1);
+ if (BM_TestHFlag(v, BM_SELECT)) BM_Select_Vert(bm, v, TRUE);
normal_short_to_float_v3(v->no, mvert->no);
@@ -176,11 +176,11 @@
BM_SetIndex(e, i); /* set_ok */
et[i] = e;
- /*transfer flags*/
+ /* transfer flags */
e->head.hflag = BM_Edge_Flag_From_MEFlag(medge->flag);
- /*this is necassary for selection counts to work properly*/
- if (BM_TestHFlag(e, BM_SELECT)) BM_Select(bm, e, 1);
+ /* this is necassary for selection counts to work properly */
+ if (BM_TestHFlag(e, BM_SELECT)) BM_Select(bm, e, TRUE);
/*Copy Custom Data*/
CustomData_to_bmesh_block(&me->edata, &bm->edata, i, &e->head.data);
@@ -243,7 +243,7 @@
f->head.hflag = BM_Face_Flag_From_MEFlag(mpoly->flag);
/*this is necassary for selection counts to work properly*/
- if (BM_TestHFlag(f, BM_SELECT)) BM_Select(bm, f, 1);
+ if (BM_TestHFlag(f, BM_SELECT)) BM_Select(bm, f, TRUE);
f->mat_nr = mpoly->mat_nr;
if (i == me->act_face) bm->act_face = f;
Modified: branches/bmesh/blender/source/blender/bmesh/operators/primitiveops.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/primitiveops.c 2011-12-21 02:41:27 UTC (rev 42782)
+++ branches/bmesh/blender/source/blender/bmesh/operators/primitiveops.c 2011-12-21 03:33:32 UTC (rev 42783)
@@ -237,7 +237,7 @@
mul_m4_v3(mat,vec);
eve= BM_Make_Vert(bm, vec, NULL);
- BM_Select(bm, eve, 1);
+ BM_Select(bm, eve, TRUE);
if (a) {
e = BM_Make_Edge(bm, preveve, eve, NULL, 1);
@@ -372,7 +372,7 @@
eva[a]= BM_Make_Vert(bm, vec, NULL);
mul_m4_v3(mat, eva[a]->co);
- BM_Select(bm, eva[a], 1);
+ BM_Select(bm, eva[a], TRUE);
}
for(a=0;a<20;a++) {
Modified: branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c 2011-12-21 02:41:27 UTC (rev 42782)
+++ branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c 2011-12-21 03:33:32 UTC (rev 42783)
@@ -1113,7 +1113,7 @@
ele = BMO_IterNew(&iter, bm, &op, "outinner", BM_EDGE|BM_VERT);
for (; ele; ele=BMO_IterStep(&iter)) {
- BM_Select(bm, ele, 1);
+ BM_Select(bm, ele, TRUE);
}
} else if (seltype == SUBDIV_SELECT_LOOPCUT) {
BMOIter iter;
@@ -1125,7 +1125,7 @@
ele = BMO_IterNew(&iter, bm, &op, "outinner", BM_EDGE|BM_VERT);
for (; ele; ele=BMO_IterStep(&iter)) {
- BM_Select(bm, ele, 1);
+ BM_Select(bm, ele, TRUE);
if (ele->htype == BM_VERT) {
BMEdge *e;
@@ -1134,12 +1134,12 @@
BM_ITER(e, &eiter, bm, BM_EDGES_OF_VERT, ele) {
if (!BM_TestHFlag(e, BM_SELECT) && BM_TestHFlag(e->v1, BM_SELECT)
&& BM_TestHFlag(e->v2, BM_SELECT)) {
- BM_Select(bm, e, 1);
+ BM_Select(bm, e, TRUE);
bm->totedgesel += 1;
} else if (BM_TestHFlag(e, BM_SELECT) && (!BM_TestHFlag(e->v1, BM_SELECT)
|| !BM_TestHFlag(e->v2, BM_SELECT))) {
- BM_Select(bm, e, 0);
- bm->totedgesel -= 1;
+ BM_Select(bm, e, FALSE);
+ bm->totedgesel -= 1;
}
}
}
Modified: branches/bmesh/blender/source/blender/bmesh/tools/BME_dupe_ops.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/tools/BME_dupe_ops.c 2011-12-21 02:41:27 UTC (rev 42782)
+++ branches/bmesh/blender/source/blender/bmesh/tools/BME_dupe_ops.c 2011-12-21 03:33:32 UTC (rev 42783)
@@ -29,7 +29,7 @@
CustomData_bmesh_copy_data(&source_mesh->vdata, &target_mesh->vdata, source_vertex->data, &target_vertex->data);
/*Copy Markings*/
- if(BM_Is_Selected((BMHeader*)source_vertex)) BM_Select_Vert(target_mesh, target_vertex, 1);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list