[Bf-blender-cvs] [7b35a9818cc] master: Merge branch 'blender-v2.83-release'

Sergey Sharybin noreply at git.blender.org
Mon May 4 17:17:57 CEST 2020


Commit: 7b35a9818ccbed6bb5204d3256828719bdcfc7f8
Author: Sergey Sharybin
Date:   Mon May 4 17:17:38 2020 +0200
Branches: master
https://developer.blender.org/rB7b35a9818ccbed6bb5204d3256828719bdcfc7f8

Merge branch 'blender-v2.83-release'

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



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

diff --cc source/blender/editors/object/object_modifier.c
index bcc5bf3e1ae,35905b09080..35dd3ba4cec
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@@ -1462,10 -1442,12 +1462,15 @@@ static int multires_subdivide_exec(bCon
      return OPERATOR_CANCELLED;
    }
  
 +  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);
 +  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);



More information about the Bf-blender-cvs mailing list