[Bf-blender-cvs] [429841e5fd1] master: Merge branch 'blender-v2.83-release'

[Pablo Dobarro]

Commit: 429841e5fd1c5fa77291ec46f3f0e5170ad30342
Author: Pablo Dobarro
Date:   Wed May 13 03:00:34 2020 +0200
Branches: master
https://developer.blender.org/rB429841e5fd1c5fa77291ec46f3f0e5170ad30342

Merge branch 'blender-v2.83-release'

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



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

diff --cc release/scripts/startup/bl_ui/properties_data_modifier.py
index a2c477bd6f1,0a5d5ef3d8a..6f3dae9e01c
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@@ -698,23 -699,16 +698,26 @@@ class DATA_PT_modifiers(ModifierButtons
          col = split.column()
  
          col.enabled = ob.mode != 'EDIT'
 -        col.operator("object.multires_subdivide", text="Subdivide")
 +        op = col.operator("object.multires_subdivide", text="Subdivide")
 +        op.mode = 'CATMULL_CLARK'
 +
 +        op = col.operator("object.multires_subdivide", text="Subdivide Simple")
 +        op.mode = 'SIMPLE'
 +
 +        op = col.operator("object.multires_subdivide", text="Subdivide Linear")
 +        op.mode = 'LINEAR'
 +
          col.operator("object.multires_higher_levels_delete", text="Delete Higher")
 +        col.operator("object.multires_unsubdivide", text="Unsubdivide")
          col.operator("object.multires_reshape", text="Reshape")
          col.operator("object.multires_base_apply", text="Apply Base")
 +        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()