[Bf-blender-cvs] [673f44fa16e] master: Merge branch 'blender-v2.83-release'

[Sergey Sharybin]

Commit: 673f44fa16e6cd83efbe228b9040263f27a5c9ca
Author: Sergey Sharybin
Date:   Mon May 4 17:40:57 2020 +0200
Branches: master
https://developer.blender.org/rB673f44fa16e6cd83efbe228b9040263f27a5c9ca

Merge branch 'blender-v2.83-release'

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



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

diff --cc source/blender/editors/object/object_modifier.c
index 35dd3ba4cec,a24f3ba2269..bcc5bf3e1ae
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@@ -1462,15 -1442,8 +1462,10 @@@ static int multires_subdivide_exec(bCon
      return OPERATOR_CANCELLED;
    }
  
 -  multiresModifier_subdivide(object, mmd);
 +  const eMultiresSubdivideModeType subdivide_mode = (eMultiresSubdivideModeType)(
 +      RNA_enum_get(op->ptr, "mode"));
- 
-   ED_sculpt_undo_push_multires_mesh_begin(C, op->type->name);
- 
 +  multiresModifier_subdivide(object, mmd, subdivide_mode);
  
-   ED_sculpt_undo_push_multires_mesh_end(C, op->type->name);
- 
    ED_object_iter_other(
        CTX_data_main(C), object, true, ED_object_multires_update_totlevels_cb, &mmd->totlvl);