diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-03-02 06:46:21 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-02 06:46:21 +0300 |
| commit | da2d0fe43af030b5fe6e11226e7e691242f001aa (patch) | |
| tree | 2f701d643bad9a51616a1a47d96a3d36acc43c26 /source/blender/editors/include/ED_object.h | |
| parent | 4913e47aa0107cbe1daf06e8020a60916ea883a3 (diff) | |
| parent | ff74357da09d5060d61d247f75dbb01e91ca3bb9 (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 | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h index 3e04c8ccc8e..6c53d24ef8c 100644 --- a/source/blender/editors/include/ED_object.h +++ b/source/blender/editors/include/ED_object.h @@ -118,9 +118,6 @@ struct Base *ED_object_add_duplicate(struct Main *bmain, struct Scene *scene, st void ED_object_parent(struct Object *ob, struct Object *parent, const int type, const char *substr); -bool ED_object_mode_compat_set(struct bContext *C, struct WorkSpace *workspace, eObjectMode mode, struct ReportList *reports); -void ED_object_toggle_modes(struct bContext *C, eObjectMode mode); - /* bitflags for enter/exit editmode */ #define EM_FREEDATA 1 #define EM_FREEUNDO 2 @@ -217,6 +214,10 @@ void undo_push_lattice(struct bContext *C, const char *name); void ED_lattice_flags_set(struct Object *obedit, int flag); +bool ED_object_mode_compat_test(const struct Object *ob, eObjectMode mode); +bool ED_object_mode_compat_set(struct bContext *C, struct WorkSpace *workspace, eObjectMode mode, struct ReportList *reports); +void ED_object_mode_toggle(struct bContext *C, eObjectMode mode); + /* object_modifier.c */ enum { MODIFIER_APPLY_DATA = 1, |