blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Merge branch 'master' into blender2.8

This commit is contained in:
Campbell Barton 2018-08-20 17:53:53 +10:00
parent 3ef1aeb15e f52e31a46d
commit d2e70455cf
Notes: blender-bot 2023-02-14 05:25:42 +01:00 
Referenced by issue #56466, Sculpt Mode performance drop with Overlays
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/bmesh/intern/bmesh_operator_api_inline.h
View File

@ -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;

3
source/blender/bmesh/operators/bmo_subdivide.c
View File

@ -1363,6 +1363,9 @@ void bmo_bisect_edges_exec(BMesh *bm, BMOperator *op)
bmo_subd_init_shape_info(bm, &params);
/* 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, &params, e->v1, e->v2);