[Bf-blender-cvs] [86cc29d0cf3] master: Multires: Disallow changing mode and quality after subdivision

[Sergey Sharybin]

Commit: 86cc29d0cf3be547cd93ac0daec420d57dc687f7
Author: Sergey Sharybin
Date:   Fri Mar 20 09:50:00 2020 +0100
Branches: master
https://developer.blender.org/rB86cc29d0cf3be547cd93ac0daec420d57dc687f7

Multires: Disallow changing mode and quality after subdivision

Avoids possible final object shape destruction since those options
defines how displacement is applied and propagated.

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

M	release/scripts/startup/bl_ui/properties_data_modifier.py

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

diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index bcf1c285d2b..7508b0e2321 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -665,7 +665,19 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
         col.prop(md, "offset_v")
 
     def MULTIRES(self, layout, ob, md):
-        layout.row().prop(md, "subdivision_type", expand=True)
+        # Changing some of the properties can not be done once there is an
+        # actual displacement stored for this multires modifier. This check
+        # will disallow those properties from change.
+        # This is a bit stupid check but should be sufficient for the usual
+        # multires usage. It might become less strict and only disallow
+        # modifications if there is CD_MDISPS layer, or if there is actual
+        # non-zero displacement but such checks will be too slow to be done
+        # on every redraw.
+        have_displacement = (md.total_levels != 0)
+
+        row = layout.row()
+        row.enabled = not have_displacement
+        row.prop(md, "subdivision_type", expand=True)
 
         split = layout.split()
         col = split.column()
@@ -673,7 +685,10 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
         # TODO(sergey): Expose it again after T58473 is solved.
         # col.prop(md, "sculpt_levels", text="Sculpt")
         col.prop(md, "render_levels", text="Render")
-        col.prop(md, "quality")
+
+        row = col.row()
+        row.enabled = not have_displacement
+        row.prop(md, "quality")
 
         col = split.column()