diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-03-03 08:39:57 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-03 08:39:57 +0300 |
| commit | 8d575899a17f12681beb9bdb3f7d3005d6d12103 (patch) | |
| tree | cfe94562589ae081d939623196373e296a270199 /source/blender/editors/include/ED_object.h | |
| parent | b8f7538348e6ff37d960cd933562d1f5ff15241c (diff) | |
WorkSpace: use existing mode data w/ scene-switch
Check if mode data exists before attempting to change the modes.
Diffstat (limited to 'source/blender/editors/include/ED_object.h')
| -rw-r--r-- | source/blender/editors/include/ED_object.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h index 296b69ca20b..2a3d5d144ac 100644 --- a/source/blender/editors/include/ED_object.h +++ b/source/blender/editors/include/ED_object.h @@ -57,6 +57,7 @@ struct PropertyRNA; struct EnumPropertyItem; struct EvaluationContext; struct WorkSpace; +struct wmWindow; struct wmWindowManager; #include "DNA_object_enums.h" @@ -211,7 +212,8 @@ bool ED_object_mode_compat_set(struct bContext *C, struct WorkSpace *workspace, void ED_object_mode_toggle(struct bContext *C, eObjectMode mode); bool ED_object_mode_generic_enter( - struct bContext *C, eObjectMode object_mode); + struct bContext *C, + eObjectMode object_mode); void ED_object_mode_generic_exit( const struct EvaluationContext *eval_ctx, struct WorkSpace *workspace, struct Scene *scene, struct Object *ob); @@ -220,11 +222,16 @@ bool ED_object_mode_generic_has_data( struct Object *ob); bool ED_object_mode_generic_enter_or_other_window( - struct bContext *C, eObjectMode object_mode); + struct bContext *C, const struct wmWindow *win_compare, + eObjectMode object_mode); void ED_object_mode_generic_exit_or_other_window( const struct EvaluationContext *eval_ctx, struct wmWindowManager *wm, struct WorkSpace *workspace, struct Scene *scene, struct Object *ob); +bool ED_object_mode_generic_exists( + struct wmWindowManager *wm, struct Object *ob, + eObjectMode object_mode); + /* object_modifier.c */ enum { MODIFIER_APPLY_DATA = 1, |