diff options
author | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-06-18 21:49:31 +0400 |
---|---|---|
committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-06-18 21:49:31 +0400 |
commit | 58befeba602cde272505f283b0990b0286fdcad0 (patch) | |
tree | 570448728e6c1d5259610874fca83441fff69c6d | |
parent | c83805139dafcbc1e1f89d45d93380fc489feca8 (diff) |
Fix for sculpt undo updating hidden rather than coords.
Fixes bug [#31858] Undo + sculpt mode, which exposed the bug by having
two objects use the same mesh data.
The rebuild variable was initialize to true, so multires data was
getting marked as having GridHidden modified rather than coords
modified.
-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 d233c45a230..f327f67be33 100644 --- a/source/blender/editors/sculpt_paint/sculpt_undo.c +++ b/source/blender/editors/sculpt_paint/sculpt_undo.c @@ -269,7 +269,7 @@ static void sculpt_undo_restore(bContext *C, ListBase *lb) SculptSession *ss = ob->sculpt; SculptUndoNode *unode; MultiresModifierData *mmd; - int update = 0, rebuild = 1; + int update = FALSE, rebuild = FALSE; sculpt_update_mesh_elements(scene, sd, ob, 0); @@ -297,15 +297,15 @@ static void sculpt_undo_restore(bContext *C, ListBase *lb) switch (unode->type) { case SCULPT_UNDO_COORDS: if (sculpt_undo_restore_coords(C, dm, unode)) - update = 1; + update = TRUE; break; case SCULPT_UNDO_HIDDEN: if (sculpt_undo_restore_hidden(C, dm, unode)) - rebuild = 1; + rebuild = TRUE; break; case SCULPT_UNDO_MASK: if (sculpt_undo_restore_mask(C, dm, unode)) - update = 1; + update = TRUE; break; } } |