diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-03-19 12:36:27 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-19 12:36:27 +0400 |
commit | 6f104aad3ad8753358b3047a556f63cb73c04ef2 (patch) | |
tree | b74cef45c2148c561136d616dfd6dcce5be09584 /source/blender/bmesh/operators/bmo_primitive.c | |
parent | e9da46aec980c8bd0838b9dd23ada463c03309a5 (diff) |
code cleanup: bmesh api - make arg order consistent - htype before hflag or oflag.
Diffstat (limited to 'source/blender/bmesh/operators/bmo_primitive.c')
-rw-r--r-- | source/blender/bmesh/operators/bmo_primitive.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/bmesh/operators/bmo_primitive.c b/source/blender/bmesh/operators/bmo_primitive.c index e4ddbb7d0d8..5b46b251846 100644 --- a/source/blender/bmesh/operators/bmo_primitive.c +++ b/source/blender/bmesh/operators/bmo_primitive.c @@ -268,12 +268,12 @@ void bmo_create_grid_exec(BMesh *bm, BMOperator *op) BMO_op_exec(bm, &bmop); BMO_op_finish(bm, &prevop); - BMO_slot_buffer_flag_enable(bm, &bmop, "geomout", VERT_MARK, BM_VERT); + BMO_slot_buffer_flag_enable(bm, &bmop, "geomout", BM_VERT, VERT_MARK); } else { BMO_op_initf(bm, &bmop, "extrude_edge_only edges=%fe", EDGE_ORIG); BMO_op_exec(bm, &bmop); - BMO_slot_buffer_flag_enable(bm, &bmop, "geomout", VERT_MARK, BM_VERT); + BMO_slot_buffer_flag_enable(bm, &bmop, "geomout", BM_VERT, VERT_MARK); } BMO_op_callf(bm, "translate vec=%v verts=%s", vec, &bmop, "geomout"); @@ -283,7 +283,7 @@ void bmo_create_grid_exec(BMesh *bm, BMOperator *op) if (a) BMO_op_finish(bm, &bmop); - BMO_slot_buffer_from_flag(bm, op, "vertout", VERT_MARK, BM_VERT); + BMO_slot_buffer_from_flag(bm, op, "vertout", BM_VERT, VERT_MARK); } void bmo_create_uvsphere_exec(BMesh *bm, BMOperator *op) @@ -339,7 +339,7 @@ void bmo_create_uvsphere_exec(BMesh *bm, BMOperator *op) BMO_op_exec(bm, &bmop); } - BMO_slot_buffer_flag_enable(bm, &bmop, "geomout", VERT_MARK, BM_VERT); + BMO_slot_buffer_flag_enable(bm, &bmop, "geomout", BM_VERT, VERT_MARK); BMO_op_callf(bm, "rotate cent=%v mat=%m3 verts=%s", vec, cmat, &bmop, "geomout"); prevop = bmop; @@ -372,7 +372,7 @@ void bmo_create_uvsphere_exec(BMesh *bm, BMOperator *op) } } - BMO_slot_buffer_from_flag(bm, op, "vertout", VERT_MARK, BM_VERT); + BMO_slot_buffer_from_flag(bm, op, "vertout", BM_VERT, VERT_MARK); } void bmo_create_icosphere_exec(BMesh *bm, BMOperator *op) @@ -427,8 +427,8 @@ void bmo_create_icosphere_exec(BMesh *bm, BMOperator *op) "esubd edges=%fe smooth=%f numcuts=%i gridfill=%b beauty=%i", EDGE_MARK, dia, 1, TRUE, B_SPHERE); BMO_op_exec(bm, &bmop); - BMO_slot_buffer_flag_enable(bm, &bmop, "geomout", VERT_MARK, BM_VERT); - BMO_slot_buffer_flag_enable(bm, &bmop, "geomout", EDGE_MARK, BM_EDGE); + BMO_slot_buffer_flag_enable(bm, &bmop, "geomout", BM_VERT, VERT_MARK); + BMO_slot_buffer_flag_enable(bm, &bmop, "geomout", BM_EDGE, EDGE_MARK); BMO_op_finish(bm, &bmop); } @@ -439,7 +439,7 @@ void bmo_create_icosphere_exec(BMesh *bm, BMOperator *op) } } - BMO_slot_buffer_from_flag(bm, op, "vertout", VERT_MARK, BM_VERT); + BMO_slot_buffer_from_flag(bm, op, "vertout", BM_VERT, VERT_MARK); } void bmo_create_monkey_exec(BMesh *bm, BMOperator *op) @@ -486,7 +486,7 @@ void bmo_create_monkey_exec(BMesh *bm, BMOperator *op) MEM_freeN(tv); - BMO_slot_buffer_from_flag(bm, op, "vertout", VERT_MARK, BM_VERT); + BMO_slot_buffer_from_flag(bm, op, "vertout", BM_VERT, VERT_MARK); } @@ -558,7 +558,7 @@ void bmo_create_circle_exec(BMesh *bm, BMOperator *op) BMO_op_callf(bm, "dissolve_faces faces=%ff", FACE_NEW); } - BMO_slot_buffer_from_flag(bm, op, "vertout", VERT_MARK, BM_VERT); + BMO_slot_buffer_from_flag(bm, op, "vertout", BM_VERT, VERT_MARK); } void bmo_create_cone_exec(BMesh *bm, BMOperator *op) @@ -654,7 +654,7 @@ void bmo_create_cone_exec(BMesh *bm, BMOperator *op) BM_face_create_quad_tri(bm, v1, v2, firstv2, firstv1, NULL, FALSE); BMO_op_callf(bm, "removedoubles verts=%fv dist=%f", VERT_MARK, 0.000001); - BMO_slot_buffer_from_flag(bm, op, "vertout", VERT_MARK, BM_VERT); + BMO_slot_buffer_from_flag(bm, op, "vertout", BM_VERT, VERT_MARK); } void bmo_create_cube_exec(BMesh *bm, BMOperator *op) @@ -732,5 +732,5 @@ void bmo_create_cube_exec(BMesh *bm, BMOperator *op) BM_face_create_quad_tri(bm, v1, v2, v3, v4, NULL, FALSE); BM_face_create_quad_tri(bm, v8, v7, v6, v5, NULL, FALSE); - BMO_slot_buffer_from_flag(bm, op, "vertout", VERT_MARK, BM_VERT); + BMO_slot_buffer_from_flag(bm, op, "vertout", BM_VERT, VERT_MARK); } |