Merge branch 'blender-v2.83-release'

2020-05-13 03:00:34 +02:00
parent f9d0f59bed 9253386dcb
commit 429841e5fd
4 changed files with 25 additions and 6 deletions
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -714,7 +714,10 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
        col.operator("object.multires_rebuild_subdiv", text="Rebuild Subdivisions")
        col.prop(md, "uv_smooth", text="")
        col.prop(md, "show_only_control_edges")
-        col.prop(md, "use_creases")
+
+        row = col.row()
+        row.enabled = not have_displacement
+        row.prop(md, "use_creases")

        layout.separator()