diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-02-06 19:57:12 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-02-06 19:57:12 +0400 |
| commit | c30fb009ccf23cd9dc78d342ebddc2286594c88a (patch) | |
| tree | 66fbae02d6ea3c832c6c0c4e0287af3de98bb55d /source/blender/bmesh/intern/bmesh_operators.c | |
| parent | 296444e1dc28db95642ab5a804b9b0df606a4725 (diff) | |
problem with own changes to triabgulate: calling beauty fill directly would re-allocate the faces which mean't triangulates output slots pointers became invalid. (noticed when using from py api)
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_operators.c')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_operators.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/bmesh/intern/bmesh_operators.c b/source/blender/bmesh/intern/bmesh_operators.c index 3308a014d25..98958596324 100644 --- a/source/blender/bmesh/intern/bmesh_operators.c +++ b/source/blender/bmesh/intern/bmesh_operators.c @@ -562,7 +562,7 @@ static int bmo_mesh_flag_count(BMesh *bm, const char htype, const short oflag, BMElemF *ele_f; int i; - BLI_assert(ELEM(true, false, test_for_enabled)); + BLI_assert((unsigned int)test_for_enabled <= 1); for (i = 0; i < 3; i++) { if (htype & flag_types[i]) { @@ -938,7 +938,7 @@ static void bmo_slot_buffer_from_flag(BMesh *bm, BMOperator *op, int totelement, i = 0; BLI_assert(op->slots_in == slot_args || op->slots_out == slot_args); - BLI_assert(ELEM(true, false, test_for_enabled)); + BLI_assert((unsigned int)test_for_enabled <= 1); if (test_for_enabled) totelement = BMO_mesh_enabled_flag_count(bm, htype, oflag); @@ -1586,7 +1586,7 @@ static int bmo_opname_to_opcode(const char *opname) * **Utility** * * Pass an existing slot which is copied to either an input or output slot. - * Taking the operator and slot-name pair of args. + * Taking the operator and slot-name pair of args (BMOperator *, const char *). * - `s` - slot_in (lower case) * - `S` - slot_out (upper case) * |