diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-15 11:25:49 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-15 11:25:49 +0300 |
| commit | f1bc8991461fcda33eb34820bd3aa153f6122c5b (patch) | |
| tree | f6e2c533feeff8a9cf0ff36aef8035e95a5e0f0b /source/blender/editors/include/ED_object.h | |
| parent | 55b241d32a2c3192a439c51aff99a0a248ca9ef2 (diff) | |
| parent | 9636cab0098f96b9c6b6493fb7120f32d7506cd6 (diff) | |
Merge branch 'master' into blender2.8
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 0775c2b953b..8e844d327e2 100644 --- a/source/blender/editors/include/ED_object.h +++ b/source/blender/editors/include/ED_object.h @@ -122,12 +122,11 @@ 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), EM_NO_CONTEXT = (1 << 4), }; void ED_object_editmode_exit_ex( - struct bContext *C, struct Scene *scene, struct Object *obedit, int flag); + struct Scene *scene, struct Object *obedit, int flag); void ED_object_editmode_exit(struct bContext *C, int flag); void ED_object_editmode_enter_ex(struct Scene *scene, struct Object *ob, int flag); |