diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-08-20 10:53:53 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-08-20 10:53:53 +0300 |
commit | d2e70455cf460df2f73fd8594705b425314371e0 (patch) | |
tree | 4e88bac45f3647bfff57156db7ba829c50ea8b5c /source | |
parent | 3ef1aeb15ec8f8a07118eed2aa477f6c4e6e5efe (diff) | |
parent | f52e31a46dc16275a31cb36d85d09fdf1a675a65 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_operator_api_inline.h | 6 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_subdivide.c | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/bmesh/intern/bmesh_operator_api_inline.h b/source/blender/bmesh/intern/bmesh_operator_api_inline.h index eb1c161f19d..a453cfa1769 100644 --- a/source/blender/bmesh/intern/bmesh_operator_api_inline.h +++ b/source/blender/bmesh/intern/bmesh_operator_api_inline.h @@ -168,7 +168,7 @@ BLI_INLINE float BMO_slot_map_float_get(BMOpSlot *slot, const void *element) data = BMO_slot_map_data_get(slot, element); if (data) { - return **(float **)data; + return *(float *)data; } else { return 0.0f; @@ -183,7 +183,7 @@ BLI_INLINE int BMO_slot_map_int_get(BMOpSlot *slot, const void *element) data = BMO_slot_map_data_get(slot, element); if (data) { - return **(int **)data; + return *(int *)data; } else { return 0; @@ -198,7 +198,7 @@ BLI_INLINE bool BMO_slot_map_bool_get(BMOpSlot *slot, const void *element) data = BMO_slot_map_data_get(slot, element); if (data) { - return **(bool **)data; + return *(bool *)data; } else { return false; diff --git a/source/blender/bmesh/operators/bmo_subdivide.c b/source/blender/bmesh/operators/bmo_subdivide.c index 90cbe9a5d76..c8ba2134a73 100644 --- a/source/blender/bmesh/operators/bmo_subdivide.c +++ b/source/blender/bmesh/operators/bmo_subdivide.c @@ -1363,6 +1363,9 @@ void bmo_bisect_edges_exec(BMesh *bm, BMOperator *op) bmo_subd_init_shape_info(bm, ¶ms); + /* tag edges in map */ + BMO_slot_map_to_flag(bm, op->slots_in, "edge_percents", BM_EDGE, EDGE_PERCENT); + /* go through and split edges */ BMO_ITER (e, &siter, op->slots_in, "edges", BM_EDGE) { bm_subdivide_multicut(bm, e, ¶ms, e->v1, e->v2); |