diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-06 14:53:09 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-06 14:58:13 +0300 |
| commit | 486e2547eea3f12bfde70f2526dde08f39a8722b (patch) | |
| tree | c65c06162d46436c45c1972877d0b4163980411d /source/blender/editors | |
| parent | a3409d3f53f1decb3cbe5c04fd804062dcf2cf49 (diff) | |
DNA: move eObjectMode into own header
Add a enum headers to DNA, to be included in other headers
so function signatures can use enums for better type safety.
Add DNA_*_enums.h matching DNA_*.types.h as needed.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/include/ED_object.h | 6 | ||||
| -rw-r--r-- | source/blender/editors/object/object_edit.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h index cdca848f213..d74fb22faf8 100644 --- a/source/blender/editors/include/ED_object.h +++ b/source/blender/editors/include/ED_object.h @@ -54,6 +54,8 @@ struct PointerRNA; struct PropertyRNA; struct EnumPropertyItem; +#include "DNA_object_enums.h" + /* object_edit.c */ struct Object *ED_object_context(struct bContext *C); /* context.object */ struct Object *ED_object_active_context(struct bContext *C); /* context.object or context.active_object */ @@ -109,8 +111,8 @@ 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 Object *ob, int mode, struct ReportList *reports); -void ED_object_toggle_modes(struct bContext *C, int mode); +bool ED_object_mode_compat_set(struct bContext *C, struct Object *ob, eObjectMode mode, struct ReportList *reports); +void ED_object_toggle_modes(struct bContext *C, eObjectMode mode); /* bitflags for enter/exit editmode */ #define EM_FREEDATA 1 diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index f8210f8a595..43a5307de1c 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -1622,7 +1622,7 @@ static const EnumPropertyItem *object_mode_set_itemsf( return item; } -static const char *object_mode_op_string(int mode) +static const char *object_mode_op_string(eObjectMode mode) { if (mode & OB_MODE_EDIT) return "OBJECT_OT_editmode_toggle"; @@ -1688,7 +1688,7 @@ static bool object_mode_compat_test(Object *ob, eObjectMode mode) * * This is so each mode's exec function can call */ -bool ED_object_mode_compat_set(bContext *C, Object *ob, int mode, ReportList *reports) +bool ED_object_mode_compat_set(bContext *C, Object *ob, eObjectMode mode, ReportList *reports) { bool ok; if (!ELEM(ob->mode, mode, OB_MODE_OBJECT)) { @@ -1802,9 +1802,7 @@ void OBJECT_OT_mode_set(wmOperatorType *ot) RNA_def_property_flag(prop, PROP_SKIP_SAVE); } - - -void ED_object_toggle_modes(bContext *C, int mode) +void ED_object_toggle_modes(bContext *C, eObjectMode mode) { if (mode != OB_MODE_OBJECT) { const char *opstring = object_mode_op_string(mode); |