diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-02-20 05:52:35 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-20 05:52:35 +0400 |
commit | 1953f042e6f51ce9a795f1bce3cca7e8560cef86 (patch) | |
tree | 2ede8daf2f69626c3bd9e4e44a304a9ef2a6c630 /source/blender/bmesh/operators | |
parent | 818e19713a089ffb500201bf3e1c3d8327c75fb9 (diff) |
added boolean type for bmesh operators, will make python wrapping clearer and also makes existing calls more obvious.
also corrected some error reports.
Diffstat (limited to 'source/blender/bmesh/operators')
-rw-r--r-- | source/blender/bmesh/operators/bmo_bevel.c | 6 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_create.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_dissolve.c | 6 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_dupe.c | 6 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_extrude.c | 8 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_join_triangles.c | 6 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_mesh_conv.c | 6 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_mirror.c | 4 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_primitive.c | 10 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_subdivide.c | 8 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_utils.c | 18 |
11 files changed, 42 insertions, 38 deletions
diff --git a/source/blender/bmesh/operators/bmo_bevel.c b/source/blender/bmesh/operators/bmo_bevel.c index 98e9a510126..aab8d7d40dd 100644 --- a/source/blender/bmesh/operators/bmo_bevel.c +++ b/source/blender/bmesh/operators/bmo_bevel.c @@ -190,11 +190,11 @@ void bmesh_bevel_exec(BMesh *bm, BMOperator *op) BLI_array_declare(edges); SmallHash hash; float fac = BMO_slot_float_get(op, "percent"); - const short do_even = BMO_slot_int_get(op, "use_even"); - const short do_dist = BMO_slot_int_get(op, "use_dist"); + const short do_even = BMO_slot_bool_get(op, "use_even"); + const short do_dist = BMO_slot_bool_get(op, "use_dist"); int i, li, has_elens, HasMDisps = CustomData_has_layer(&bm->ldata, CD_MDISPS); - has_elens = CustomData_has_layer(&bm->edata, CD_PROP_FLT) && BMO_slot_int_get(op, "use_lengths"); + has_elens = CustomData_has_layer(&bm->edata, CD_PROP_FLT) && BMO_slot_bool_get(op, "use_lengths"); if (has_elens) { li = BMO_slot_int_get(op, "lengthlayer"); } diff --git a/source/blender/bmesh/operators/bmo_create.c b/source/blender/bmesh/operators/bmo_create.c index d90e5c36c80..39f1ff10a9a 100644 --- a/source/blender/bmesh/operators/bmo_create.c +++ b/source/blender/bmesh/operators/bmo_create.c @@ -872,7 +872,7 @@ void bmesh_edgenet_fill_exec(BMesh *bm, BMOperator *op) BMEdge **edges = NULL; PathBase *pathbase = edge_pathbase_new(); BLI_array_declare(edges); - int use_restrict = BMO_slot_int_get(op, "use_restrict"); + int use_restrict = BMO_slot_bool_get(op, "use_restrict"); int i, j, group = 0; unsigned int winding[2]; /* accumulte winding directions for each edge which has a face */ diff --git a/source/blender/bmesh/operators/bmo_dissolve.c b/source/blender/bmesh/operators/bmo_dissolve.c index 05aead466d1..46124590d5e 100644 --- a/source/blender/bmesh/operators/bmo_dissolve.c +++ b/source/blender/bmesh/operators/bmo_dissolve.c @@ -79,7 +79,7 @@ void dissolvefaces_exec(BMesh *bm, BMOperator *op) BMWalker regwalker; int i; - int use_verts = BMO_slot_int_get(op, "use_verts"); + int use_verts = BMO_slot_bool_get(op, "use_verts"); if (use_verts) { /* tag verts that start out with only 2 edges, @@ -160,7 +160,7 @@ void dissolvefaces_exec(BMesh *bm, BMOperator *op) } - BMO_op_callf(bm, "del geom=%ff context=%d", FACE_ORIG, DEL_FACES); + BMO_op_callf(bm, "del geom=%ff context=%i", FACE_ORIG, DEL_FACES); if (use_verts) { @@ -247,7 +247,7 @@ void dissolveedges_exec(BMesh *bm, BMOperator *op) BMIter viter; BMVert *v; - int use_verts = BMO_slot_int_get(op, "use_verts"); + int use_verts = BMO_slot_bool_get(op, "use_verts"); if (use_verts) { BM_ITER(v, &viter, bm, BM_VERTS_OF_MESH, NULL) { diff --git a/source/blender/bmesh/operators/bmo_dupe.c b/source/blender/bmesh/operators/bmo_dupe.c index 2e1c91d920c..676e2eeb5f6 100644 --- a/source/blender/bmesh/operators/bmo_dupe.c +++ b/source/blender/bmesh/operators/bmo_dupe.c @@ -468,7 +468,7 @@ void spinop_exec(BMesh *bm, BMOperator *op) float q[4]; float rmat[3][3]; float phi, si; - int steps, dupli, a, usedvec; + int steps, do_dupli, a, usedvec; BMO_slot_vec_get(op, "cent", cent); BMO_slot_vec_get(op, "axis", axis); @@ -477,7 +477,7 @@ void spinop_exec(BMesh *bm, BMOperator *op) usedvec = !is_zero_v3(dvec); steps = BMO_slot_int_get(op, "steps"); phi = BMO_slot_float_get(op, "ang") * (float)M_PI / (360.0f * steps); - dupli = BMO_slot_int_get(op, "dupli"); + do_dupli = BMO_slot_bool_get(op, "do_dupli"); si = (float)sin(phi); q[0] = (float)cos(phi); @@ -488,7 +488,7 @@ void spinop_exec(BMesh *bm, BMOperator *op) BMO_slot_copy(op, op, "geom", "lastout"); for (a = 0; a < steps; a++) { - if (dupli) { + if (do_dupli) { BMO_op_initf(bm, &dupop, "dupe geom=%s", op, "lastout"); BMO_op_exec(bm, &dupop); BMO_op_callf(bm, "rotate cent=%v mat=%m3 verts=%s", diff --git a/source/blender/bmesh/operators/bmo_extrude.c b/source/blender/bmesh/operators/bmo_extrude.c index b6a87e604ec..2c6a0e0de6a 100644 --- a/source/blender/bmesh/operators/bmo_extrude.c +++ b/source/blender/bmesh/operators/bmo_extrude.c @@ -107,7 +107,7 @@ void bmesh_extrude_face_indiv_exec(BMesh *bm, BMOperator *op) BLI_array_free(edges); - BMO_op_callf(bm, "del geom=%ff context=%d", EXT_DEL, DEL_ONLYFACES); + BMO_op_callf(bm, "del geom=%ff context=%i", EXT_DEL, DEL_ONLYFACES); BMO_slot_from_flag(bm, op, "faceout", EXT_KEEP, BM_FACE); } @@ -201,7 +201,7 @@ void extrude_edge_context_exec(BMesh *bm, BMOperator *op) /* if one flagged face is bordered by an unflagged face, then we delete * original geometry unless caller explicitly asked to keep it. */ - if (!BMO_slot_int_get(op, "alwayskeeporig")) { + if (!BMO_slot_bool_get(op, "alwayskeeporig")) { BM_ITER(e, &iter, bm, BM_EDGES_OF_MESH, NULL) { if (!BMO_elem_flag_test(bm, e, EXT_INPUT)) continue; @@ -248,7 +248,7 @@ void extrude_edge_context_exec(BMesh *bm, BMOperator *op) } if (delorig) { - BMO_op_initf(bm, &delop, "del geom=%fvef context=%d", + BMO_op_initf(bm, &delop, "del geom=%fvef context=%i", EXT_DEL, DEL_ONLYTAGGED); } @@ -576,7 +576,7 @@ void bmesh_solidify_face_region_exec(BMesh *bm, BMOperator *op) BMO_op_finish(bm, &reverseop); /* Extrude the region */ - BMO_op_initf(bm, &extrudeop, "extrudefaceregion alwayskeeporig=%i", TRUE); + BMO_op_initf(bm, &extrudeop, "extrudefaceregion alwayskeeporig=%b", TRUE); BMO_slot_copy(op, &extrudeop, "geom", "edgefacein"); BMO_op_exec(bm, &extrudeop); diff --git a/source/blender/bmesh/operators/bmo_join_triangles.c b/source/blender/bmesh/operators/bmo_join_triangles.c index 921c579447b..3f102661d30 100644 --- a/source/blender/bmesh/operators/bmo_join_triangles.c +++ b/source/blender/bmesh/operators/bmo_join_triangles.c @@ -231,8 +231,10 @@ void bmesh_jointriangles_exec(BMesh *bm, BMOperator *op) BMEdge *e; BLI_array_declare(jedges); JoinEdge *jedges = NULL; - int dosharp = BMO_slot_int_get(op, "compare_sharp"), douvs = BMO_slot_int_get(op, "compare_uvs"); - int dovcols = BMO_slot_int_get(op, "compare_vcols"), domat = BMO_slot_int_get(op, "compare_materials"); + int dosharp = BMO_slot_bool_get(op, "cmp_sharp"); + int douvs = BMO_slot_bool_get(op, "cmp_uvs"); + int dovcols = BMO_slot_bool_get(op, "cmp_vcols"); + int domat = BMO_slot_bool_get(op, "cmp_materials"); float limit = BMO_slot_float_get(op, "limit"); int i, totedge; diff --git a/source/blender/bmesh/operators/bmo_mesh_conv.c b/source/blender/bmesh/operators/bmo_mesh_conv.c index 4f6db9056e5..7b929042ea9 100644 --- a/source/blender/bmesh/operators/bmo_mesh_conv.c +++ b/source/blender/bmesh/operators/bmo_mesh_conv.c @@ -69,7 +69,7 @@ void mesh_to_bmesh_exec(BMesh *bm, BMOperator *op) BLI_array_declare(fedges); float (*keyco)[3] = NULL; int *keyi; - int set_key = BMO_slot_int_get(op, "set_shapekey"); + int set_key = BMO_slot_bool_get(op, "set_shapekey"); int totuv, i, j; if (!me || !me->totvert) { @@ -370,7 +370,7 @@ void object_load_bmesh_exec(BMesh *bm, BMOperator *op) /* Scene *scene = BMO_slot_ptr_get(op, "scene"); */ Mesh *me = ob->data; - BMO_op_callf(bm, "bmesh_to_mesh mesh=%p object=%p notesselation=%i", me, ob, TRUE); + BMO_op_callf(bm, "bmesh_to_mesh mesh=%p object=%p notesselation=%b", me, ob, TRUE); } @@ -447,7 +447,7 @@ void bmesh_to_mesh_exec(BMesh *bm, BMOperator *op) BMFace *f; BMIter iter, liter; int i, j, *keyi, ototvert, totloop; - int dotess = !BMO_slot_int_get(op, "notesselation"); + int dotess = !BMO_slot_bool_get(op, "notesselation"); ototvert = me->totvert; diff --git a/source/blender/bmesh/operators/bmo_mirror.c b/source/blender/bmesh/operators/bmo_mirror.c index 82e77fc9a96..128b64b08de 100644 --- a/source/blender/bmesh/operators/bmo_mirror.c +++ b/source/blender/bmesh/operators/bmo_mirror.c @@ -48,8 +48,8 @@ void bmesh_mirror_exec(BMesh *bm, BMOperator *op) float scale[3] = {1.0f, 1.0f, 1.0f}; float dist = BMO_slot_float_get(op, "mergedist"); int i, ototvert, ototedge, axis = BMO_slot_int_get(op, "axis"); - int mirroru = BMO_slot_int_get(op, "mirror_u"); - int mirrorv = BMO_slot_int_get(op, "mirror_v"); + int mirroru = BMO_slot_bool_get(op, "mirror_u"); + int mirrorv = BMO_slot_bool_get(op, "mirror_v"); ototvert = bm->totvert; ototedge = bm->totedge; diff --git a/source/blender/bmesh/operators/bmo_primitive.c b/source/blender/bmesh/operators/bmo_primitive.c index f7a1a8f4d06..dc9b26cd665 100644 --- a/source/blender/bmesh/operators/bmo_primitive.c +++ b/source/blender/bmesh/operators/bmo_primitive.c @@ -495,8 +495,9 @@ void bmesh_create_circle_exec(BMesh *bm, BMOperator *op) BMVert *v1, *lastv1 = NULL, *cent1, *firstv1 = NULL; float vec[3], mat[4][4], phi, phid; float dia = BMO_slot_float_get(op, "diameter"); - int cap_ends = BMO_slot_int_get(op, "cap_ends"), segs = BMO_slot_int_get(op, "segments"); - int cap_tris = BMO_slot_int_get(op, "cap_tris"); + int segs = BMO_slot_int_get(op, "segments"); + int cap_ends = BMO_slot_bool_get(op, "cap_ends"); + int cap_tris = BMO_slot_bool_get(op, "cap_tris"); int a; if (!segs) @@ -567,8 +568,9 @@ void bmesh_create_cone_exec(BMesh *bm, BMOperator *op) float dia1 = BMO_slot_float_get(op, "diameter1"); float dia2 = BMO_slot_float_get(op, "diameter2"); float depth = BMO_slot_float_get(op, "depth"); - int cap_ends = BMO_slot_int_get(op, "cap_ends"), segs = BMO_slot_int_get(op, "segments"); - int cap_tris = BMO_slot_int_get(op, "cap_tris"); + int segs = BMO_slot_int_get(op, "segments"); + int cap_ends = BMO_slot_bool_get(op, "cap_ends"); + int cap_tris = BMO_slot_bool_get(op, "cap_tris"); int a; if (!segs) diff --git a/source/blender/bmesh/operators/bmo_subdivide.c b/source/blender/bmesh/operators/bmo_subdivide.c index 310762e0e37..ce00441dcac 100644 --- a/source/blender/bmesh/operators/bmo_subdivide.c +++ b/source/blender/bmesh/operators/bmo_subdivide.c @@ -693,8 +693,8 @@ void esubdivide_exec(BMesh *bmesh, BMOperator *op) fractal = BMO_slot_float_get(op, "fractal"); beauty = BMO_slot_int_get(op, "beauty"); cornertype = BMO_slot_int_get(op, "quadcornertype"); - singleedge = BMO_slot_int_get(op, "singleedge"); - gridfill = BMO_slot_int_get(op, "gridfill"); + singleedge = BMO_slot_bool_get(op, "singleedge"); + gridfill = BMO_slot_bool_get(op, "gridfill"); BLI_srandom(seed); @@ -1022,8 +1022,8 @@ void BM_mesh_esubdivideflag(Object *UNUSED(obedit), BMesh *bm, int flag, float s BMOperator op; BMO_op_initf(bm, &op, "esubd edges=%he smooth=%f fractal=%f " - "beauty=%d numcuts=%d quadcornertype=%d singleedge=%d " - "gridfill=%d seed=%d", + "beauty=%i numcuts=%i quadcornertype=%i singleedge=%b " + "gridfill=%b seed=%i", flag, smooth, fractal, beauty, numcuts, cornertype, singleedge, gridfill, seed); diff --git a/source/blender/bmesh/operators/bmo_utils.c b/source/blender/bmesh/operators/bmo_utils.c index e0187476a6a..8d7bdf598dc 100644 --- a/source/blender/bmesh/operators/bmo_utils.c +++ b/source/blender/bmesh/operators/bmo_utils.c @@ -123,7 +123,7 @@ void bmesh_edgerotate_exec(BMesh *bm, BMOperator *op) { BMOIter siter; BMEdge *e, *e2; - int ccw = BMO_slot_int_get(op, "ccw"); + int ccw = BMO_slot_bool_get(op, "ccw"); BMO_ITER(e, &siter, bm, op, "edges", BM_EDGE) { if (!(e2 = BM_edge_rotate(bm, e, ccw))) { @@ -221,15 +221,15 @@ static void bmesh_regionextend_constrict(BMesh *bm, BMOperator *op, int usefaces void bmesh_regionextend_exec(BMesh *bm, BMOperator *op) { - int usefaces = BMO_slot_int_get(op, "usefaces"); - int constrict = BMO_slot_int_get(op, "constrict"); + int use_faces = BMO_slot_bool_get(op, "use_faces"); + int constrict = BMO_slot_bool_get(op, "constrict"); BMO_slot_buffer_flag_enable(bm, op, "geom", SEL_ORIG, BM_ALL); if (constrict) - bmesh_regionextend_constrict(bm, op, usefaces); + bmesh_regionextend_constrict(bm, op, use_faces); else - bmesh_regionextend_extend(bm, op, usefaces); + bmesh_regionextend_extend(bm, op, use_faces); BMO_slot_from_flag(bm, op, "geomout", SEL_FLAG, BM_ALL); } @@ -270,7 +270,7 @@ void bmesh_righthandfaces_exec(BMesh *bm, BMOperator *op) BLI_array_declare(fstack); BMLoop *l, *l2; float maxx, cent[3]; - int i, maxi, flagflip = BMO_slot_int_get(op, "doflip"); + int i, maxi, flagflip = BMO_slot_bool_get(op, "do_flip"); startf = NULL; maxx = -1.0e10; @@ -381,9 +381,9 @@ void bmesh_vertexsmooth_exec(BMesh *bm, BMOperator *op) float *co, *co2, clipdist = BMO_slot_float_get(op, "clipdist"); int i, j, clipx, clipy, clipz; - clipx = BMO_slot_int_get(op, "mirror_clip_x"); - clipy = BMO_slot_int_get(op, "mirror_clip_y"); - clipz = BMO_slot_int_get(op, "mirror_clip_z"); + clipx = BMO_slot_bool_get(op, "mirror_clip_x"); + clipy = BMO_slot_bool_get(op, "mirror_clip_y"); + clipz = BMO_slot_bool_get(op, "mirror_clip_z"); i = 0; BMO_ITER(v, &siter, bm, op, "verts", BM_VERT) { |