diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-12 18:54:28 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-12 18:54:28 +0400 |
| commit | cd0608aff5958e6fc59aad10730255d3cac48622 (patch) | |
| tree | 1e5d580c8b7e64c4e32a5d81589ab545a438c24d /source/blender | |
| parent | 237f6fc3b373a7ddea0b030a5715a2a84ba02f41 (diff) | |
Fix #29600: Hook actions wrong Tool Shelf adjust
Do not register hook_assign and hook_remove operators in the redo panel.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/object/object_hook.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c index 2a827091fde..773974d0cc0 100644 --- a/source/blender/editors/object/object_hook.c +++ b/source/blender/editors/object/object_hook.c @@ -608,7 +608,9 @@ void OBJECT_OT_hook_remove(wmOperatorType *ot) ot->poll= hook_op_edit_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + /* this operator removes modifier which isn't stored in local undo stack, + so redoing it from redo panel gives totally weird results */ + ot->flag= /*OPTYPE_REGISTER|*/OPTYPE_UNDO; /* properties */ prop= RNA_def_enum(ot->srna, "modifier", DummyRNA_NULL_items, 0, "Modifier", "Modifier number to remove"); @@ -794,7 +796,9 @@ void OBJECT_OT_hook_assign(wmOperatorType *ot) ot->poll= hook_op_edit_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + /* this operator changes data stored in modifier which doesn't get pushed to undo stack, + so redoing it from redo panel gives totally weird results */ + ot->flag= /*OPTYPE_REGISTER|*/OPTYPE_UNDO; /* properties */ prop= RNA_def_enum(ot->srna, "modifier", DummyRNA_NULL_items, 0, "Modifier", "Modifier number to assign to"); |