[Bf-blender-cvs] [d124545013f] master: Fix wrong name for QuadriFlow undo step

Campbell Barton noreply at git.blender.org
Mon Nov 18 13:13:14 CET 2019


Commit: d124545013fda15c69bad92e7daedb717c36a357
Author: Campbell Barton
Date:   Mon Nov 18 22:42:10 2019 +1100
Branches: master
https://developer.blender.org/rBd124545013fda15c69bad92e7daedb717c36a357

Fix wrong name for QuadriFlow undo step

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

M	source/blender/editors/include/ED_sculpt.h
M	source/blender/editors/object/object_remesh.c
M	source/blender/editors/sculpt_paint/sculpt_undo.c

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

diff --git a/source/blender/editors/include/ED_sculpt.h b/source/blender/editors/include/ED_sculpt.h
index 0273c8c73ab..4a0ce7b0078 100644
--- a/source/blender/editors/include/ED_sculpt.h
+++ b/source/blender/editors/include/ED_sculpt.h
@@ -47,7 +47,7 @@ void ED_sculpt_end_transform(struct bContext *C);
 /* sculpt_undo.c */
 void ED_sculpt_undosys_type(struct UndoType *ut);
 
-void ED_sculpt_undo_geometry_begin(struct Object *ob);
+void ED_sculpt_undo_geometry_begin(struct Object *ob, const char *name);
 void ED_sculpt_undo_geometry_end(struct Object *ob);
 
 #endif /* __ED_SCULPT_H__ */
diff --git a/source/blender/editors/object/object_remesh.c b/source/blender/editors/object/object_remesh.c
index d3dca03548f..62e8d326c1c 100644
--- a/source/blender/editors/object/object_remesh.c
+++ b/source/blender/editors/object/object_remesh.c
@@ -114,7 +114,7 @@ static int voxel_remesh_exec(bContext *C, wmOperator *op)
   }
 
   if (ob->mode == OB_MODE_SCULPT) {
-    ED_sculpt_undo_geometry_begin(ob);
+    ED_sculpt_undo_geometry_begin(ob, op->type->name);
   }
 
   float isovalue = 0.0f;
@@ -421,7 +421,7 @@ static void quadriflow_start_job(void *customdata, short *stop, short *do_update
   new_mesh = remesh_symmetry_mirror(qj->owner, new_mesh, qj->symmetry_axes);
 
   if (ob->mode == OB_MODE_SCULPT) {
-    ED_sculpt_undo_geometry_begin(ob);
+    ED_sculpt_undo_geometry_begin(ob, "QuadriFlow Remesh");
   }
 
   if (qj->preserve_paint_mask) {
diff --git a/source/blender/editors/sculpt_paint/sculpt_undo.c b/source/blender/editors/sculpt_paint/sculpt_undo.c
index 052f2bd03a4..fec3bd88f0b 100644
--- a/source/blender/editors/sculpt_paint/sculpt_undo.c
+++ b/source/blender/editors/sculpt_paint/sculpt_undo.c
@@ -1279,9 +1279,9 @@ static void sculpt_undosys_step_free(UndoStep *us_p)
   sculpt_undo_free_list(&us->data.nodes);
 }
 
-void ED_sculpt_undo_geometry_begin(struct Object *ob)
+void ED_sculpt_undo_geometry_begin(struct Object *ob, const char *name)
 {
-  sculpt_undo_push_begin("voxel remesh");
+  sculpt_undo_push_begin(name);
   sculpt_undo_push_node(ob, NULL, SCULPT_UNDO_GEOMETRY);
 }



More information about the Bf-blender-cvs mailing list