diff options
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_core.c | 4 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_mods.c | 3 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c index bbfee692df4..690fdcce691 100644 --- a/source/blender/bmesh/intern/bmesh_core.c +++ b/source/blender/bmesh/intern/bmesh_core.c @@ -1692,12 +1692,12 @@ BMEdge *bmesh_jekv(BMesh *bm, BMEdge *e_kill, BMVert *v_kill, const bool check_e BLI_mempool_free(bm->lpool, loops[i]); } } - +#ifndef NDEBUG /* Validate radial cycle of e_old */ edok = bmesh_radial_validate(radlen, e_old->l); BMESH_ASSERT(edok != false); +#endif } - /* deallocate edge */ bm_kill_only_edge(bm, e_kill); diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c index a619947ddc9..a72ebbb6f2c 100644 --- a/source/blender/bmesh/intern/bmesh_mods.c +++ b/source/blender/bmesh/intern/bmesh_mods.c @@ -178,8 +178,7 @@ bool BM_disk_dissolve(BMesh *bm, BMVert *v) e = v->e; do { f = NULL; - len = bmesh_radial_length(e->l); - if (len == 2 && (e != baseedge) && (e != keepedge)) { + if (BM_edge_is_manifold(e) && (e != baseedge) && (e != keepedge)) { f = BM_faces_join_pair(bm, e->l->f, e->l->radial_next->f, e, true); /* return if couldn't join faces in manifold * conditions */ diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index a7acb3e3aba..8b06a4037cc 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -3823,7 +3823,7 @@ static void radial_control_paint_cursor(bContext *C, int x, int y, void *customd fdrawline((float)WM_RADIAL_CONTROL_DISPLAY_MIN_SIZE, 0.0f, (float)WM_RADIAL_CONTROL_DISPLAY_SIZE, 0.0f); glPopMatrix(); rmin = WM_RADIAL_CONTROL_DISPLAY_MIN_SIZE; - BLI_snprintf(str, WM_RADIAL_MAX_STR, "%3f", rc->current_value * 180.0f / M_PI); + BLI_snprintf(str, WM_RADIAL_MAX_STR, "%3f", RAD2DEGF(rc->current_value)); strdrawlen = BLI_strlen_utf8(str); } |