Merge branch 'blender-v4.3-release'

2024-10-29 11:21:30 +01:00
parent 8d4d59d0cd 5d548dc3a1
commit f9f77c582c
1 changed files with 9 additions and 1 deletions
--- a/source/blender/editors/uvedit/uvedit_unwrap_ops.cc
+++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.cc
@@ -222,7 +222,15 @@ static void modifier_unwrap_state(Object *obedit,
   * only if modifier is first or right after mirror. */
  if (subsurf) {
    if (md && md->type == eModifierType_Subsurf) {
-      subsurf = true;
+      const SubsurfModifierData &smd = *reinterpret_cast<const SubsurfModifierData *>(md);
+      if (smd.levels > 0) {
+        /* Skip all calculation for zero subdivision levels, similar to the way the modifier is
+         * disabled in that case. */
+        subsurf = true;
+      }
+      else {
+        subsurf = false;
+      }
    }
    else {
      subsurf = false;