diff options
author | Joseph Eagar <joeedh@gmail.com> | 2021-07-17 10:44:01 +0300 |
---|---|---|
committer | Joseph Eagar <joeedh@gmail.com> | 2021-07-17 10:44:01 +0300 |
commit | 7c4eb4f8dbcf5fd98d8b089aa3cd7291b3910357 (patch) | |
tree | a3585864d68cc1a2a6b5f0be5da616c7d31cc590 /source/blender/editors/sculpt_paint/sculpt_undo.c | |
parent | 792292e3de00ed758cf4f5b675938b59f4a4cf21 (diff) | |
parent | 118803893e65c52c02ed274f7be2d60c668d5b56 (diff) |
Merge branch 'master' into temp_bmesh_multires
Diffstat (limited to 'source/blender/editors/sculpt_paint/sculpt_undo.c')
-rw-r--r-- | source/blender/editors/sculpt_paint/sculpt_undo.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/sculpt_paint/sculpt_undo.c b/source/blender/editors/sculpt_paint/sculpt_undo.c index 831ee3a6163..df4b43d21a2 100644 --- a/source/blender/editors/sculpt_paint/sculpt_undo.c +++ b/source/blender/editors/sculpt_paint/sculpt_undo.c @@ -1025,7 +1025,7 @@ static void sculpt_undo_restore_list(bContext *C, Depsgraph *depsgraph, ListBase case SCULPT_UNDO_DYNTOPO_BEGIN: case SCULPT_UNDO_DYNTOPO_END: case SCULPT_UNDO_DYNTOPO_SYMMETRIZE: - printf("Dynamic topology should've already been handled\n"); + BLI_assert_msg(0, "Dynamic topology should've already been handled"); break; } } @@ -1361,7 +1361,7 @@ static SculptUndoNode *sculpt_undo_alloc_node(Object *ob, PBVHNode *node, Sculpt case SCULPT_UNDO_DYNTOPO_BEGIN: case SCULPT_UNDO_DYNTOPO_END: case SCULPT_UNDO_DYNTOPO_SYMMETRIZE: - printf("Dynamic topology should've already been handled\n"); + BLI_assert_msg(0, "Dynamic topology should've already been handled"); case SCULPT_UNDO_GEOMETRY: case SCULPT_UNDO_FACE_SETS: break; @@ -1757,7 +1757,7 @@ SculptUndoNode *SCULPT_undo_push_node(Object *ob, PBVHNode *node, SculptUndoType case SCULPT_UNDO_DYNTOPO_BEGIN: case SCULPT_UNDO_DYNTOPO_END: case SCULPT_UNDO_DYNTOPO_SYMMETRIZE: - printf("Dynamic topology should've already been handled\n"); + BLI_assert_msg(0, "Dynamic topology should've already been handled"); case SCULPT_UNDO_GEOMETRY: case SCULPT_UNDO_FACE_SETS: break; @@ -2017,7 +2017,7 @@ void ED_sculpt_undosys_type(UndoType *ut) ut->step_decode = sculpt_undosys_step_decode; ut->step_free = sculpt_undosys_step_free; - ut->flags = 0; + ut->flags = UNDOTYPE_FLAG_DECODE_ACTIVE_STEP; ut->step_size = sizeof(SculptUndoStep); } |