diff options
author | Daniel Dunbar <daniel@zuster.org> | 2005-08-20 11:42:25 +0400 |
---|---|---|
committer | Daniel Dunbar <daniel@zuster.org> | 2005-08-20 11:42:25 +0400 |
commit | 1ac10f50f483c2c365fa015c8c045c8f7344ad02 (patch) | |
tree | 3a5204be007b67dce7f3816217c7a090876c01bd /source/blender/src/buttons_editing.c | |
parent | a30740c1964059e1e6d3ca652da324ff0d505a1a (diff) |
- bug fix, apply modifier removed modifier even on certain
errors
- change drawimagespace to check and update object data if
it needs a recalc. this fixes errors with a recalc being
flushed but not actually being done before spaceimage
redraws. Updates typically actually happen in draw loop,
which is not a great design...
- make shared vertexcol didn't flush update
Diffstat (limited to 'source/blender/src/buttons_editing.c')
-rw-r--r-- | source/blender/src/buttons_editing.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c index ef35971cfa1..2ad63245b88 100644 --- a/source/blender/src/buttons_editing.c +++ b/source/blender/src/buttons_editing.c @@ -762,10 +762,12 @@ static void modifiers_applyModifier(void *obv, void *mdv) return; } - BLI_remlink(&ob->modifiers, md); - modifier_free(md); + if (converted) { + BLI_remlink(&ob->modifiers, md); + modifier_free(md); - BIF_undo_push("Apply modifier"); + BIF_undo_push("Apply modifier"); + } } static void modifiers_copyModifier(void *ob_v, void *md_v) |