diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-15 11:02:01 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-15 11:10:48 +0300 |
| commit | 9636cab0098f96b9c6b6493fb7120f32d7506cd6 (patch) | |
| tree | 2d2e85d94c1d6d650dd535321473d016d9b92799 /source/blender/editors/include/ED_object.h | |
| parent | ae8225ba6d6d704110296023630e5b86befeb326 (diff) | |
Undo System: remove nested edit-mode undo calls
Regression in recent undo system changes,
This caused T55048.
When each mode had its own undo stack it was important
to initialize it when entering edit-mode.
Diffstat (limited to 'source/blender/editors/include/ED_object.h')
| -rw-r--r-- | source/blender/editors/include/ED_object.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h index 2087394b6f6..614be5dd0c1 100644 --- a/source/blender/editors/include/ED_object.h +++ b/source/blender/editors/include/ED_object.h @@ -115,10 +115,9 @@ void ED_object_parent(struct Object *ob, struct Object *parent, const int type, enum { EM_FREEDATA = (1 << 0), EM_WAITCURSOR = (1 << 1), - EM_DO_UNDO = (1 << 2), EM_IGNORE_LAYER = (1 << 3), }; -void ED_object_editmode_exit_ex(struct bContext *C, struct Scene *scene, struct Object *obedit, int flag); +void ED_object_editmode_exit_ex(struct Scene *scene, struct Object *obedit, int flag); void ED_object_editmode_exit(struct bContext *C, int flag); void ED_object_editmode_enter(struct bContext *C, int flag); bool ED_object_editmode_load(struct Object *obedit); |