[Bf-blender-cvs] [416686707f4] temp_bmesh_multires: commit before merge

[Joseph Eagar]

Commit: 416686707f4e9f33bd537420510871aa6fe1b5df
Author: Joseph Eagar
Date:   Wed Sep 1 21:32:43 2021 -0700
Branches: temp_bmesh_multires
https://developer.blender.org/rB416686707f4e9f33bd537420510871aa6fe1b5df

commit before merge

===================================================================

M	release/datafiles/locale
M	release/scripts/addons
M	source/blender/blenkernel/intern/dyntopo.c
M	source/tools

===================================================================

diff --git a/release/datafiles/locale b/release/datafiles/locale
index 35573b45adc..326997b913d 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 35573b45adc0cc00a29538a68567621ab571a88f
+Subproject commit 326997b913d04bc5bc4656973d1e1a819f860dd2
diff --git a/release/scripts/addons b/release/scripts/addons
index 985f6d8c304..59c8409947c 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 985f6d8c304630c155133e9b368fdb7a29cac216
+Subproject commit 59c8409947c4174983a36ec28dfeda2be9e254d2
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
index 08de10dbd82..548055f4021 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 08de10dbd8234c242b1896a6813d2a6335288e74
+Subproject commit 548055f40213c775a6b77025525c91e8466e70d6