bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Fix wrong name for QuadriFlow undo step

Browse Source
This commit is contained in:
Campbell Barton 2019-11-18 22:42:10 +11:00
parent 8d4460b6c4
commit d124545013
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/include/ED_sculpt.h
View File

@ -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__ */

4
source/blender/editors/object/object_remesh.c
View File

@ -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) {

4
source/blender/editors/sculpt_paint/sculpt_undo.c
View File

@ -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);
}