diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-13 17:06:41 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-13 17:06:41 +0300 |
| commit | b330804ff3eca68cdd65e26d551d1829fae5ff36 (patch) | |
| tree | 7501de6265ae963e064a580e6339539740a9008b /source/blender/editors/include/ED_object.h | |
| parent | 9e2ec6c86a9ea2e387fe5e523df06c0a462819b7 (diff) | |
| parent | 9fb1f9c5cdccc14f65ba2047e5656b360142aa43 (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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h index 94ee228f4f8..757a463f171 100644 --- a/source/blender/editors/include/ED_object.h +++ b/source/blender/editors/include/ED_object.h @@ -126,6 +126,8 @@ void ED_object_toggle_modes(struct bContext *C, eObjectMode mode); #define EM_WAITCURSOR 4 #define EM_DO_UNDO 8 #define EM_IGNORE_LAYER 16 +void ED_object_editmode_exit_ex( + struct bContext *C, struct WorkSpace *workspace, 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); |