[Bf-blender-cvs] [1222f561a21] blender-v2.83-release: Revert "Fix T76313: Redo in Multires doesn't bring back stroke made after a subdivide"

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


Commit: 1222f561a21f03bba2b80cf5ea57018d65da693b
Author: Sergey Sharybin
Date:   Mon May 4 17:38:15 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rB1222f561a21f03bba2b80cf5ea57018d65da693b

Revert "Fix T76313: Redo in Multires doesn't bring back stroke made after a subdivide"

The fix was actually missing few bits:

- Firstly, the operator itself is not to do UNDO push
- Secondly, multires sculpt/top level are not pushed to the undo
  node, so undo can not happen reliably.

It should be possible to incorporate some of the work from WIP patch
for propagation undo, but it needs more work.

Reverting code base to the previous state, since currently things
are actually a bit more confusing then they used to be.

This reverts commit 0c928087a3c8a4f758a907fe3096346f88d678c9.

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

M	source/blender/editors/object/object_modifier.c

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

diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index 35905b09080..a24f3ba2269 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -1442,12 +1442,8 @@ static int multires_subdivide_exec(bContext *C, wmOperator *op)
     return OPERATOR_CANCELLED;
   }
 
-  ED_sculpt_undo_push_multires_mesh_begin(C, op->type->name);
-
   multiresModifier_subdivide(object, mmd);
 
-  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