diff options
| m--------- | release/datafiles/locale | 0 | ||||
| m--------- | release/scripts/addons | 0 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/dyntopo.c | 10 | ||||
| m--------- | source/tools | 0 |
4 files changed, 10 insertions, 0 deletions
diff --git a/release/datafiles/locale b/release/datafiles/locale -Subproject 35573b45adc0cc00a29538a68567621ab571a88 +Subproject 326997b913d04bc5bc4656973d1e1a819f860dd diff --git a/release/scripts/addons b/release/scripts/addons -Subproject 985f6d8c304630c155133e9b368fdb7a29cac21 +Subproject 59c8409947c4174983a36ec28dfeda2be9e254d diff --git a/source/blender/blenkernel/intern/dyntopo.c b/source/blender/blenkernel/intern/dyntopo.c index d2324788561..1f9c0dd290d 100644 --- a/source/blender/blenkernel/intern/dyntopo.c +++ b/source/blender/blenkernel/intern/dyntopo.c @@ -2463,6 +2463,11 @@ static void edge_queue_create_local(EdgeQueueContext *eq_ctx, continue; } + // check seam/sharp flags here + if (!(e->head.hflag & BM_ELEM_SMOOTH) || e->head.hflag & BM_ELEM_SEAM) { + continue; + } + float limit = lens[i]; // limit *= detail_range; @@ -2618,6 +2623,11 @@ static void short_edge_queue_create(EdgeQueueContext *eq_ctx, continue; } + // check seam/sharp flags in edge itself, not just verts + if (!(e->head.hflag & BM_ELEM_SMOOTH) || e->head.hflag & BM_ELEM_SEAM) { + continue; + } + float w = calc_weighted_edge_collapse(eq_ctx, e->v1, e->v2); float w2 = maskcb_get(eq_ctx, e); diff --git a/source/tools b/source/tools -Subproject 08de10dbd8234c242b1896a6813d2a6335288e7 +Subproject 548055f40213c775a6b77025525c91e8466e70d |